Changeset 13814

Timestamp:

05/22/12 12:36:30 (13 years ago)

Author:

neise

Message:

evolving

Location:

fact/tools/PyDimCtrl

Files:

• factdimserver.py (modified) (2 diffs)
• pyfactctrl.py (modified) (4 diffs)

fact/tools/PyDimCtrl/factdimserver.py

@@ -30 +30 @@
         self.user_func = None
         self.__delay_between_cmds = 1.0
-        seld.__delay_between_services = 1.0
+        self.__delay_between_services = 1.0
         self.__last_cmd_send = -1*float('inf')
         self.__last_service_got = -1*float('inf')
@@ -46 +46 @@
             desc = 'I'
             args=(1,)
+        elif desc == 'O':
+            args = (0,)
         while not time.time() - self.__last_cmd_send > self.__delay_between_cmds:
             time.sleep(0.5)

fact/tools/PyDimCtrl/pyfactctrl.py

@@ -5 +5 @@
 source_list = { '1ES 1218+304' : [( 0.6, -5), (0.6, 175)] ,\
     'Crab' : [(0.6, 50), (0.6, -130)], \
-    'Mrk 421' : [(0.6, 90),(0.6, -90)] \
+    'Mrk 421' : [(0.6, 90),(0.6, -90)], \
     'Mrk 501' : [(0.6, 90),(0.6, -90)] }
 
@@ -56 +56 @@
         if not WaitToCalmDown( CalmDownTime, verbose = True):
             msg.fail("a problem in WaitToCalmDown(). drive state: "+drive.sts)
-            return False:
+            return False
     
     msg.ok('Tracking Source '+SrcName + ' Angle:'+str(Angle)+' Shift:'+str(Shift))
@@ -200 +200 @@
 
     fad.reset_secondary_drs_baseline()
-    if roi == 300
+    if roi == 300:
         Take( -1, 1000, 'pedestal')
         fad.set_file_format(2)
@@ -289 +289 @@
 
 
-def VoltageOff
 def std_bias_watchdog( state, verbose=True ):
     msg = MSG(verbose)