Ops changes

Author: USAXS account

src/usaxs/plans/axis_tuning.py

@@ -423,7 +423,7 @@ def find_a2rp(md: Optional[Dict[str, Any]] = None):
     Generator[Any, None, None]
         A generator that yields plan steps
     """
-    howWiderRangeToScan = 4
+    howWiderRangeToScan = 2.5
     howManyPoints = 61
     if md is None:
         md = {}
@@ -453,7 +453,7 @@ def find_a2rp(md: Optional[Dict[str, Any]] = None):
         tune_start = -1*howWiderRangeToScan*a_stage.r2p.tune_range.get()
         tune_end = howWiderRangeToScan*a_stage.r2p.tune_range.get()
         #tune_start must be larger than 0
-        tune_start =  max(tune_start, 0)
+        #tune_start =  max(tune_start, 0)
         tune_end =  min(tune_end, 88)
         yield from lineup2(
             [upd_photocurrent_calc, scaler0],

src/usaxs/user/ptc10_plan.py

@@ -306,16 +306,18 @@ def collectWAXS(debug=False):
 
     logger.info(f"Ramping temperature to {temp1} C")
 
+    t0 = time.time()
     while (
         not ptc10.temperature.inposition
     ):  # runs data collection until next temp or sleeps. Change as needed.
-        yield from bps.sleep(5)
+        #yield from bps.sleep(5)
         logger.info(f"Still Ramping temperature to {temp1} C")
-        yield from collectWAXS()
+        yield from collectAllThree()
 
     # logger.info("Reached temperature, now collecting data for %s minutes", delay1min)
     logger.info("Reached temperature, now collecting data for %s seconds", delay1)
     t1 = time.time()
+    t0 = time.time()
 
     while time.time() - t1 < delay1:  # collects data for delay1 seconds
         # yield from bps.sleep(5)