Merge branch 'master' into master

Author: rdemaria

README.md

@@ -32,6 +32,15 @@ pytimber with other CERN libraries, such as [PyJapc][].
 
   * For Windows, [this][jpype-win] pre-compiled version of JPype seems to work
     best.
+  * For CERN machines without internet access, you need to manually install the
+    dependencies and use the mirrors on the Scripting Tools GitLab group:
+
+    ```sh
+    pip install git+https://gitlab.cern.ch/scripting-tools/jpype.git
+    pip install git+https://gitlab.cern.ch/scripting-tools/cmmnbuild-dep-manager.git
+    pip install git+https://gitlab.cern.ch/scripting-tools/pytimber.git
+
+    ```
 
 [jpype-win]: http://www.lfd.uci.edu/~gohlke/pythonlibs/#jpype
 

pytimber/pytimber.py

@@ -640,9 +640,9 @@ def getIntervalsByLHCModes(self, t1, t2, mode1, mode2, unixtime=True,
         fills = self.getLHCFillsByTime(ts1, ts2, [mode1, mode2])
         out = []
         for fill in fills:
-            fn = [fill['fillNumber']]
-            m1 = []
-            m2 = []
+            fn=fill['fillNumber']
+            m1=[]
+            m2=[]
             for bm in fill['beamModes']:
                 if bm['mode'] == mode1:
                     m1.append(bm[mode1time])