Making NYX Dewar 8x3

config_params.py

@@ -76,7 +76,7 @@ class RasterStatus(Enum):
 
 GOVERNOR_TIMEOUT = 120  # seconds for a governor move
 
-DEWAR_SECTORS = {'amx':8, 'fmx':8, 'nyx':5}
+DEWAR_SECTORS = {'amx':8, 'fmx':8, 'nyx':8}
 PUCKS_PER_DEWAR_SECTOR = {'amx':3, 'fmx':3, 'nyx':3}
 
 cryostreamTempPV = {'amx': 'AMX:cs700:gasT-I', 'fmx': 'FMX:cs700:gasT-I'}

daq_main_common.py

@@ -183,4 +183,4 @@ def run_server():
   beamline_support.pvPut(immediate_comm_pv,"\n")  
   comm_pv.add_callback(comm_cb)
   immediate_comm_pv.add_callback(comm2_cb)
-  process_commands(0.5)
+  process_commands(0.5)

db_lib.py

@@ -827,4 +827,3 @@ def deleteCompletedRequestsforSample(sid):
     if (requestList[i]["priority"] == -1): #good to clean up completed requests after unmount
       if (requestList[i]["protocol"] == "raster" or requestList[i]["protocol"] == "vector"):
         deleteRequest(requestList[i]['uid'])
-

gui/control_main.py

@@ -5408,4 +5408,4 @@ def aux_send_to_server(self, s):
             logger.info("aux_send_to_server: %s" % s)
             self.immediate_comm_pv.put(s)
         else:
-            self.popupServerMessage("You don't have control")
+            self.popupServerMessage("You don't have control")

gui/dewar_tree.py

@@ -478,4 +478,4 @@ def getSelectedSample(self):
             elif str(item.data(33)) == "request":
                 selectedSampleRequest = db_lib.getRequestByID(item.data(32))
                 selectedSampleID = selectedSampleRequest["sample"]
-        return selectedSampleID
+        return selectedSampleID

gui/dialog/__init__.py

@@ -5,3 +5,4 @@
 from .puck_dialog import PuckDialog
 from .dewar import DewarDialog
 from .screen_defaults import ScreenDefaultsDialog
+

gui/dialog/dewar.py

@@ -59,7 +59,7 @@ def initUI(self):
             for j in range(0, self.pucksPerDewarSector):
                 dataIndex = (i * self.pucksPerDewarSector) + j
                 self.allButtonList[dataIndex] = QtWidgets.QPushButton(
-                    (str(self.data[dataIndex]))
+                    '{}: {}'.format(str(dataIndex+1),str(self.data[dataIndex]))
                 )
                 self.allButtonList[dataIndex].clicked.connect(
                     functools.partial(self.on_button, str(dataIndex))

gui/dialog/screen_defaults.py

@@ -271,4 +271,4 @@ def checkEntryState(self, *args, **kwargs):
             color = "#f6989d"  # red
         else:
             color = "#ffffff"  # white
-        sender.setStyleSheet("QLineEdit { background-color: %s }" % color)
+        sender.setStyleSheet("QLineEdit { background-color: %s }" % color)

gui/dialog/staff_screen.py

@@ -362,4 +362,4 @@ def screenDefaultsCancelCB(self):
         self.hide()
 
     def screenDefaultsOKCB(self):
-        self.hide()
+        self.hide()

gui/dialog/user_screen.py

@@ -253,4 +253,4 @@ def screenDefaultsCancelCB(self):
         self.done(QtWidgets.QDialog.Rejected)
 
     def screenDefaultsOKCB(self):
-        self.done(QtWidgets.QDialog.Accepted)
+        self.done(QtWidgets.QDialog.Accepted)

ispybLib.py

@@ -413,4 +413,4 @@ def insertRasterResult(request,visitName):
  params = mxacquisition.get_data_collection_group_params()
  params['parentid'] = sessionid
  params['experimenttype'] = 'OSC'
- return createDataCollection(directory, filePrefix, jpegImageFilename, params, request_obj, sessionid)
+ return createDataCollection(directory, filePrefix, jpegImageFilename, params, request_obj, sessionid)

md2_flyers.py

@@ -266,4 +266,4 @@ def update_parameters(self, omega_range, line_range, total_uturn_range, start_om
             "invert_direction": invert_direction,
             "use_centring_table": use_centring_table,
             "use_fast_mesh_scans": use_fast_mesh_scans,
-        }
+        }

runFastDPH5.py

@@ -54,4 +54,4 @@
   dimpleComm = getBlConfig("dimpleComm")
   comm_s = f"ssh -q {dimpleNode} \"{os.environ['MXPROCESSINGSCRIPTSDIR']}dimple.sh {request_id} {numstart}\""  
   logger.info(f"running dimple: {comm_s}")
-  os.system(comm_s)
+  os.system(comm_s)

setenergy_lsdc.py

@@ -1001,4 +1001,4 @@ def beam_center_align(transSet='All'):
             if transSet in ['All', 'BCU']:
                 yield from trans_set(transOrgBCU, trans=trans_bcu)
         else:
-            yield from trans_set(transOrgBCU, trans=trans_bcu)
+            yield from trans_set(transOrgBCU, trans=trans_bcu)