Merge pull request #84 from OSU-CMS/DEV

Dev

Configuration/XMLUtil.py

@@ -180,9 +180,9 @@ class MonitoringModule():
   def __init__(self,boardtype):
     self.Type=boardtype 
     if 'RD53A' in boardtype:
-      self.Enable="1" 
+      self.Enable=Monitor_RD53A
     else:
-      self.Enable="1"
+      self.Enable=Monitor_CROC
     self.SleepTime=10000
     self.MonitoringList = {}
   def SetType(self, Type):

Gui/siteConfig.py

@@ -39,6 +39,11 @@
 #################################
 
 
+## Specify whether of not you want to monitor chip temperature during the tests ##
+## Set this to "1" if you want the monitoring enabled.  Set it to "0" if you want it disabled. ##
+Monitor_RD53A = "1"
+Monitor_CROC = "0"
+
 #setting default HV current compliance in mA
 defaultHVCurrentCompliance = 0.00001
 

Gui/siteSettings_template.py

@@ -1,19 +1,31 @@
 ######################################################################
 # To be edited by expert as default setting for Hardware configuration
 ######################################################################
+
 # Set gpib debug mode to True if you want to see SCPI commands sent to HV and LV devices:
 GPIB_DebugMode = False
 
-# Ph2_ACF version being used
-defaultACFVersion = "4.0.13"
+
+##  The following block sets defaults that are to be used in the simplified (non-expert) mode.  ##
+##  This mode is currently under development, so these values don't currently do anything       ##
+
 # default FC7 boardName
 defaultFC7 = "fc7.board.1"
 # default IP address of IP address
 defaultFC7IP = '192.168.1.80'
-# default fpga config
-#defaultFPGAConfig = 'IT-uDTC_L12-KSU-3xQUAD_L8-KSU2xQUAD_x1G28'
 # default FMC board number
 defaultFMC = '0'
+# default mode for LV powering (Direct,SLDO,etc)
+defaultPowerMode = "SLDO"
+#default DBServerIP
+defaultDBServerIP = '127.0.0.1'
+#default DBName
+defaultDBName = 'SampleDB'
+##################################
+
+
+## The following block assigns ports to devices when the "connect all devices" button is clicked ##
+
 # default USB port for HV power supply
 defaultUSBPortHV = ["ASRL/dev/ttyUSBHV::INSTR"]
 # default model for HV power supply
@@ -22,27 +34,59 @@
 defaultUSBPortLV = ["ASRL/dev/ttyUSBLV::INSTR"]
 # default model for LV power supply
 defaultLVModel = ["KeySight E3633 (RS232)"]
-# default setting for module ( "SingleSCC","TFPX Quad","TEPX Quad","TBPX Quad","Yellow Module (Purdue)"):
-defaultModuleType = "TFPX Quad"
-# default mode for LV powering (Direct,SLDO,etc)
-defaultPowerMode = "SLDO"
+#default BaudRate for Arduino sensor
+defaultSensorBaudRate = 9600
+#################################
+
 
-#defaultVoltageMap = {
-#    "Direct" : 1.28,
-#    "SLDO"   : 1.90
-#}
+## Specify whether of not you want to monitor chip temperature during the tests ##
+## Set this to "1" if you want the monitoring enabled.  Set it to "0" if you want it disabled. ##
+Monitor_RD53A = "1"
+Monitor_CROC = "0"
 
 #setting default HV current compliance in mA
 defaultHVCurrentCompliance = 0.00001
-#setting default HV bias voltage in V
+
+#setting HV bias voltage in V
 defaultHVsetting = -60
-#default BaudRate for Arduino sensor
-defaultSensorBaudRate = 9600
-#default DBServerIP
-defaultDBServerIP = '127.0.0.1'
-#default DBName
-defaultDBName = 'SampleDB'
+
+## Configuring the current settings for each module type.  These values are in Amps. 
+ModuleCurrentMap = {
+	"SingleSCC" : 0.6,
+	"TFPX Quad" : 6.5,
+	"TEPX Quad" : 6,
+	"TBPX Quad" : 6.5,
+	"Yellow Module (Purdue)": 6.5,
+
+	"CROC 1x2"  : 4.5,
+
+	"TFPX CROC Quad" : 6.5,
+	"CROC SCC"  : 2.0,
+}
+
+## Configuring the voltage limit for each module type when operating in SLDO mode.  These values are in Volts.
+ModuleVoltageMapSLDO = {
+	"SingleSCC" : 1.8,
+	"TFPX Quad" : 2.98,
+	"TEPX Quad" : 2.0,
+	"TBPX Quad" : 2.98,
+	"Yellow Module (Purdue)": 2.8,
+
+	"CROC 1x2"  : 2.2,
+
+	"TFPX CROC Quad" : 2.98,
+	"CROC SCC"  : 1.8,
+}
+
+##  Configuring the voltage settings for each module type.  These values are in Volts.
+ModuleVoltageMap = {
+	"SingleSCC" : 1.3,
+	"CROC SCC"  : 1.6,
+}
+
+#setting the sequence of threshold tuning targets:
 defaultTargetThr = ['2000','1500','1200','1000','800']
+
 ##### The following settings are for SLDO scans developed for Purdue.#####
 ##### Do not modify these settings unless you know what you are doing.####
 #default settings for SLDO scan.
@@ -55,4 +99,4 @@
 defaultPeltierPort = '/dev/ttyUSBPeltier'
 defaultPeltierBaud = 9600
 defaultPeltierSetTemp = 20
-defaultPeltierWarningTemp = 40
+defaultPeltierWarningTemp = 40