diff --git a/src/analysis.py b/src/analysis.py index 06a6e7b..516ad2b 100644 --- a/src/analysis.py +++ b/src/analysis.py @@ -676,6 +676,13 @@ class AnalysisProcedure(QObject): print(f'y1 sample length = {len(self.y1_sample)}') print(f'y2 sample length = {len(self.y2_sample)}', flush=True) + + #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)): + self.y2_sample[i] = self.y2_sample[i] * (-1) + #series = pd.Series(self.y1_sample) #self.y1_sample = (series * (-1)).tolist() #self.y1_sample = (series).tolist() diff --git a/tina.json b/tina.json index 19f11a9..e8089c9 100755 --- a/tina.json +++ b/tina.json @@ -74,9 +74,9 @@ "minimumCurrent": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Inj2 I_min (mA):", "value" : "0.100"}} }, " Cyclotron ": { - "peakHeight": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak height:", "value" : 50 }}, + "peakHeight": {"flag": 1, "data":{ "widget": "QLineEdit", "text" :"Min peak height:", "value" : 1000 }}, "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 }}, + "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"}} } }, diff --git a/tina.sh b/tina.sh index b5f045d..17b3187 100755 --- a/tina.sh +++ b/tina.sh @@ -1,5 +1,5 @@ #!/bin/bash -cd /hipa/bd/applications/tina/1.1.0 +cd /hipa/bd/applications/tina/1.2.0 # For use if script is sourced rather than executed appNameDefault="tina.sh"