Closedown

script/keithley.py

@@ -138,7 +138,10 @@ class Keithley(object):
         """
         switch keithleys to free run.
         0.1 s dwell time, 1 s poll interval.
+
+        _do nothing for now!_
         """
+        return None
         self.nplcCh.write(5.)
         self.navgCh.write(1.)
         self.scanCh.write(6)

script/local.py

@@ -116,16 +116,16 @@ def prepare_keithleys(dwell, triggered):
     
     dwell = dwell time in seconds (0.1 - 20.0)
     """
-    #KeiSample.prepare(dwell, triggered)
-    #KeiReference.prepare(dwell, triggered)
+    KeiSample.prepare(dwell, triggered)
+    KeiReference.prepare(dwell, triggered)
     
 def trig_keithleys():
     """
     trigger keithleys, do not wait.
     after this, you have to wait for at least the dwell time before reading the value!
     """
-    #KeiSample.trig()
-    #KeiReference.trig()
+    KeiSample.trig()
+    KeiReference.trig()
 
 def wait_keithleys():
     """
@@ -140,16 +140,16 @@ def fetch_keithleys():
     this requires that at least the dwell time has passed since the last trigger.
     the value can then be read from the SampleCurrent and ReferenceCurrent devices.
     """
-    #KeiSample.fetch()
-    #KeiReference.fetch()
+    KeiSample.fetch()
+    KeiReference.fetch()
 
 def release_keithleys():
     """
     switch keithleys to free run.
     0.1 s polling and dwell time
     """
-    #KeiSample.release()
-    #KeiReference.release()
+    KeiSample.release()
+    KeiReference.release()
 
 diag_channels = []
 diag_channels.append(Scienta.channelBegin)       #diag_channels.append(ChannelDouble("ChannelBegin", "X03DA-SCIENTA:cam1:CHANNEL_BEGIN_RBV"))

script/optics/PhotonFluxSpectrum.py

@@ -12,7 +12,7 @@ RANGE = "G1200 full"
 #RANGE = "G600 full"
 #RANGE = "C K-edge"
 BEAM = "G1200 1x1"
-BEAM = "G1200 6x10"
+#BEAM = "G1200 6x10"
 
 if RANGE == "G600 full":
     # G600 full spectrum
@@ -36,7 +36,7 @@ elif RANGE == "C K-edge":
     LATENCY = 1.0
     DWELL = 1.0
 
-prepare_keithleys(DWELL, True)
+prepare_keithleys(DWELL, False)
 
 if BEAM == "G600 1x1":
     # G600 1x1 reference sscan_2268 (elog:119)