Changeset 149

Timestamp:

01/18/10 09:41:13 (15 years ago)

Author:

daqct3

Message:

Changes to two .py files

Location:

trigger

Files:

• CommunicateWithVME.py (modified) (2 diffs)
• ReadTemperatures.py (modified) (2 diffs)

trigger/CommunicateWithVME.py

@@ -4 +4 @@
 #  CommunicateWithVME.py
 #  Handles the communication with the VME crate
-#  can send commands to the VME crate
+#  Sends commands to the VME crate
 #
 #  
@@ -56 +56 @@
         #GlobalVariables.ServerMessage = str(beginCounter[i])
     #GlobalVariables.ServerMessage = "Evaluating rates..."
-    time.sleep(1)
+    time.sleep(2)
     for i in range(0,16):
         endCounter[i] = _VME. V560_Read_Counter( module,  i)
         #GlobalVariables.ServerMessage = str(endCounter[i])
-        rates[i+1] =(endCounter[i]-beginCounter[i])/1000.
+        rates[i+1] =(endCounter[i]-beginCounter[i])/2000.
     return rates
 

trigger/ReadTemperatures.py

@@ -4 +4 @@
 import time
 import datetime
+
+
 class ReadTemperatures(threading.Thread):
 
    
 
+    filename=""
     
     def run(self):
         time.sleep(0.01)
         while(GlobalVariables.UserInput[1:]!="exit" and GlobalVariables.UserInput[1:] != "EXIT"):
-            filename="/ct3data/SlowData/CLIM_20090924.slow"
-            file = open(filename, 'r')
+            MyTime = time.time()
+            hour = time.gmtime(MyTime)[3]
+            if(hour>=13):
+                MyTime+=12*60*60
+            year = time.gmtime(MyTime)[0]
+            month =time.gmtime(MyTime)[1]
+            day = time.gmtime(MyTime)[2]
+            date=str(year)
+            #if (hour>=12):
+            #    day = day+1
+        
+
+            date+="%(month)02d" % {"month":month}
+            date+="%(day)02d" % {"day":day}
+            #date+="_"
+            #date+="%(hour)02d" % {"hour":hour}
+            #date+="%(minute)02d" % {"minute":minute}
+            self.filename="/ct3data/SlowData/CLIM_"+date+".slow"
+            file = open(self.filename, 'r')
             #ArduinoMessage = self.ser.readline()
             Lines= file.readlines()
@@ -23 +43 @@
             GlobalVariables.ServerMessage   = Message
             #print Message
-            time.sleep(5)
+            time.sleep(15)