added reverse polarity flag

src/analysis.py

@@ -73,8 +73,13 @@ class AnalysisProcedure(QObject):
         self.injector_2 = self.parent.injector_2
         self.ring_cyclotron = self.parent.ring_cyclotron
         self.accelerator_list = self.parent.accelerator_list
+        
+        self.reverse_input_signal = False
+        self.reverse_output_signal = True
         # Declare input parameters
         self.input_parameters = self.parent.input_parameters
+
+        
         self.input_data = None
         self.debug = False
         self.log_level = logging.INFO
@@ -149,6 +154,10 @@ class AnalysisProcedure(QObject):
         else:
             self.loglevel = self.input_data['loggingLevel']
 
+
+        self.reverse_input_signal = False
+        self.reverse_output_signal = True
+            
         self.logger.setLevel(self.logging.getLevelName(self.loglevel))
 
         if 'debug' in self.input_data.keys():
@@ -182,6 +191,14 @@ class AnalysisProcedure(QObject):
             #    self.input_data[self.accelerator_peak_search][
             #        'minimumCurrent'])
 
+
+            self.reverse_input_singal = bool(
+                self.input_data[self.accelerator]['reverseInput'])
+            self.reverse_output_singal = bool(
+                self.input_data[self.accelerator]['reverseOutput'])
+            
+            
+            
             print (f'Accelerator: {self.accelerator}', flush=True)
             if self.injector_2 in self.accelerator:
                 self.mod_freq = float(
@@ -677,11 +694,13 @@ class AnalysisProcedure(QObject):
             print(f'y2 sample length = {len(self.y2_sample)}', flush=True)
 
 
-            #for i in range(0, len(self.y1_sample)):
+            if self.reverse_input_signal:
-            #    self.y1_sample[i] =  self.y1_sample[i] * (-1)
+                for i in range(0, len(self.y1_sample)):
+                    self.y1_sample[i] =  self.y1_sample[i] * (-1)
 
-            for i in range(0, len(self.y2_sample)):
+            if self.reverse_output_signal:        
-                self.y2_sample[i] =  self.y2_sample[i] * (-1)    
+                for i in range(0, len(self.y2_sample)):
+                    self.y2_sample[i] =  self.y2_sample[i] * (-1)    
             
             #series = pd.Series(self.y1_sample)
             #self.y1_sample = (series * (-1)).tolist()

src/gui.py

@@ -40,11 +40,11 @@ class AppGui(QWidget):
         self.input_labels = self.parent.input_labels
         self.expert_parameters = self.parent.expert_parameters
         self.gui_frame.expert_parameters_group.setFixedWidth(280)
-        self.gui_frame.expert_parameters_group.setFixedHeight(350)
+        self.gui_frame.expert_parameters_group.setFixedHeight(430)
         self.gui_frame.operator_parameters_group.setFixedWidth(260)
         self.gui_frame.operator_parameters_group.setFixedHeight(400)
         self.gui_frame.measurement_tab_wgt.setFixedWidth(516)
-        self.gui_frame.measurement_tab_wgt.setFixedHeight(480)
+        self.gui_frame.measurement_tab_wgt.setFixedHeight(580)
         self.gui_frame.operator_wgt.setFixedHeight(640)
         # self.gui_frame.expert_wgt.setFixedHeight(240)
         self.gui_frame.expert_wgt.layout().addWidget(
@@ -61,6 +61,7 @@ class AppGui(QWidget):
         self.daq_wgt.setCurrentIndex(self.parent.default_idx)
         self.daq_wgt.currentChanged.emit(self.parent.default_idx)
 
+
         # Accelerator Current
         self.current_wgt = self.accelerator_current_group_qtabwidget(
             widget_type='QStackedWidget')

tina.json

@@ -71,20 +71,24 @@
 	    "peakHeight":  {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak height:", "value" : 50 }},
 	    "peakDistance":  {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak distance: ", "value" : 10 }},
 	    "correlationPeakDifference":  {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min dcorr(peak1-peak2):", "value" : 0.01}},
-	    "minimumCurrent": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Inj2 I_min (mA):", "value" : "0.100"}}
+	    "minimumCurrent": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Inj2 I_min (mA):", "value" : "0.100"}},
+	    "reverseInput": {"flag": 1, "data":{ "widget": "QCheckBox", "text" :"Reverse Input Polarity:    ", "value" : 0, "orientation":"RightToLeft"}},
+	    "reverseOutput": {"flag": 1, "data":{ "widget": "QCheckBox", "text" :"Reverse Output Polarity: ", "value" : 1, "orientation":"RightToLeft"}}
 	},
         " Cyclotron ": {	    
-	    "peakHeight":  {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak height:", "value" : 1000 }},
+	    "peakHeight":  {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak height:", "value" : 100 }},
 	    "peakDistance":  {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak distance: ", "value" : 10 }},
 	    "correlationPeakDifference":  {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min dcorr(peak1-peak2):", "value" : 0.005 }},
-	    "minimumCurrent": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Inj2 I_min (mA):", "value" : "0.100"}}
+	    "minimumCurrent": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Inj2 I_min (mA):", "value" : "0.100"}},
+	    "reverseInput": {"flag": 1, "data":{ "widget": "QCheckBox", "text" :"Reverse Input Polarity:    ", "value" : 0, "orientation":"RightToLeft"}},
+	    "reverseOutput": {"flag": 1, "data":{ "widget": "QCheckBox", "text" :"Reverse Output Polarity: ", "value" : 1, "orientation":"RightToLeft"}}
 	}
     },
 
     
     "Parameters":{
 	"freqrf" : {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"RF Freq (10^6/s):", "value" : 50.6328 }},
-	"freqsampling" : {"flag": 1, "data":{ "widget": "QLineRead", "text" :"Sampling Freq (GHz):", "value" : 3.0 }},
+	"freqsampling" : {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Sampling Freq (GHz):", "value" : 3.036 }},
 	
 	"drawLine" : {"flag" : 1, "data":{ "widget": "QHLine", "text" : "None", "value" : "None"}},
 	"accelerator" : {"flag" : 1, "data":{ "widget": "QTabWidget", "text" : "Accelerator: ",