GIT: Merge branch 'development'

laborleben · laborleben · commit f286c9562f8d · 2018-03-05T15:33:53.000+01:00
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.2.dev0
+3.0.2
diff --git a/pybar/scans/calibrate_hit_or.py b/pybar/scans/calibrate_hit_or.py
@@ -244,4 +244,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(HitOrCalibration)
+    RunManager('configuration.yaml').run_run(HitOrCalibration)
diff --git a/pybar/scans/calibrate_plsr_dac.py b/pybar/scans/calibrate_plsr_dac.py
@@ -323,4 +323,4 @@ def plateau_fit_fn(x, offset):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(PlsrDacCalibration)
+    RunManager('configuration.yaml').run_run(PlsrDacCalibration)
diff --git a/pybar/scans/calibrate_plsr_dac_transient.py b/pybar/scans/calibrate_plsr_dac_transient.py
@@ -312,4 +312,4 @@ def analyze(self):
             progress_bar.finish()
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(PlsrDacTransientCalibration)
+    RunManager('configuration.yaml').run_run(PlsrDacTransientCalibration)
diff --git a/pybar/scans/calibrate_pulser_dac_correction.py b/pybar/scans/calibrate_pulser_dac_correction.py
@@ -45,4 +45,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(PulserDacCorrectionCalibration)
+    RunManager('configuration.yaml').run_run(PulserDacCorrectionCalibration)
diff --git a/pybar/scans/calibrate_threshold.py b/pybar/scans/calibrate_threshold.py
@@ -172,4 +172,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(ThresholdCalibration)
+    RunManager('configuration.yaml').run_run(ThresholdCalibration)
diff --git a/pybar/scans/calibrate_tot.py b/pybar/scans/calibrate_tot.py
@@ -102,4 +102,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(TotCalibration)
+    RunManager('configuration.yaml').run_run(TotCalibration)
diff --git a/pybar/scans/scan_analog.py b/pybar/scans/scan_analog.py
@@ -77,4 +77,4 @@ def deactivate_tdc(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(AnalogScan)
+    RunManager('configuration.yaml').run_run(AnalogScan)
diff --git a/pybar/scans/scan_crosstalk.py b/pybar/scans/scan_crosstalk.py
@@ -103,4 +103,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(CrosstalkScan)
+    RunManager('configuration.yaml').run_run(CrosstalkScan)
diff --git a/pybar/scans/scan_digital.py b/pybar/scans/scan_digital.py
@@ -46,4 +46,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(DigitalScan)
+    RunManager('configuration.yaml').run_run(DigitalScan)
diff --git a/pybar/scans/scan_ext_trigger.py b/pybar/scans/scan_ext_trigger.py
@@ -162,4 +162,4 @@ def stop_trigger(self, timeout=10.0):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(ExtTriggerScan)
+    RunManager('configuration.yaml').run_run(ExtTriggerScan)
diff --git a/pybar/scans/scan_ext_trigger_gdac.py b/pybar/scans/scan_ext_trigger_gdac.py
@@ -65,4 +65,4 @@ def get_gdacs_from_calibration_file(self, calibration_file):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(ExtTriggerGdacScan)
+    RunManager('configuration.yaml').run_run(ExtTriggerGdacScan)
diff --git a/pybar/scans/scan_ext_trigger_stop_mode.py b/pybar/scans/scan_ext_trigger_stop_mode.py
@@ -212,4 +212,4 @@ def stop_trigger(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(StopModeExtTriggerScan)
+    RunManager('configuration.yaml').run_run(StopModeExtTriggerScan)
diff --git a/pybar/scans/scan_fei4_self_trigger.py b/pybar/scans/scan_fei4_self_trigger.py
@@ -134,4 +134,4 @@ def stop_trigger(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(Fei4SelfTriggerScan)
+    RunManager('configuration.yaml').run_run(Fei4SelfTriggerScan)
diff --git a/pybar/scans/scan_ileak.py b/pybar/scans/scan_ileak.py
@@ -65,4 +65,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(IleakScan)
+    RunManager('configuration.yaml').run_run(IleakScan)
diff --git a/pybar/scans/scan_init.py b/pybar/scans/scan_init.py
@@ -23,4 +23,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(InitScan)
+    RunManager('configuration.yaml').run_run(InitScan)
diff --git a/pybar/scans/scan_iv.py b/pybar/scans/scan_iv.py
@@ -104,4 +104,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(IVScan)
+    RunManager('configuration.yaml').run_run(IVScan)
diff --git a/pybar/scans/scan_threshold.py b/pybar/scans/scan_threshold.py
@@ -81,4 +81,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(ThresholdScan)
+    RunManager('configuration.yaml').run_run(ThresholdScan)
diff --git a/pybar/scans/scan_threshold_fast.py b/pybar/scans/scan_threshold_fast.py
@@ -173,4 +173,4 @@ def scan_condition(self, occupancy_array):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(FastThresholdScan)
+    RunManager('configuration.yaml').run_run(FastThresholdScan)
diff --git a/pybar/scans/test_register.py b/pybar/scans/test_register.py
@@ -79,4 +79,4 @@ def test_pixel_register(self, pix_regs=["EnableDigInj", "Imon", "Enable", "C_Hig
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(RegisterTest)
+    RunManager('configuration.yaml').run_run(RegisterTest)
diff --git a/pybar/scans/test_tdc.py b/pybar/scans/test_tdc.py
@@ -118,4 +118,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(TdcTest)
+    RunManager('configuration.yaml').run_run(TdcTest)
diff --git a/pybar/scans/tune_fdac.py b/pybar/scans/tune_fdac.py
@@ -169,4 +169,4 @@ def set_start_fdac(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(FdacTuning)
+    RunManager('configuration.yaml').run_run(FdacTuning)
diff --git a/pybar/scans/tune_feedback.py b/pybar/scans/tune_feedback.py
@@ -224,4 +224,4 @@ def set_prmp_vbpf_bit(self, bit_position, bit_value=1):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(FeedbackTuning)
+    RunManager('configuration.yaml').run_run(FeedbackTuning)
diff --git a/pybar/scans/tune_fei4.py b/pybar/scans/tune_fei4.py
@@ -178,4 +178,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(Fei4Tuning)
+    RunManager('configuration.yaml').run_run(Fei4Tuning)
diff --git a/pybar/scans/tune_gdac.py b/pybar/scans/tune_gdac.py
@@ -283,4 +283,4 @@ def set_gdac_bit(self, bit_position, bit_value=1, send_command=True):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(GdacTuning)
+    RunManager('configuration.yaml').run_run(GdacTuning)
diff --git a/pybar/scans/tune_gdac_standard.py b/pybar/scans/tune_gdac_standard.py
@@ -196,4 +196,4 @@ def write_target_threshold(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(GdacTuningStandard)
+    RunManager('configuration.yaml').run_run(GdacTuningStandard)
diff --git a/pybar/scans/tune_hot_pixels.py b/pybar/scans/tune_hot_pixels.py
@@ -78,4 +78,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(HotPixelTuning)
+    RunManager('configuration.yaml').run_run(HotPixelTuning)
diff --git a/pybar/scans/tune_merged_pixels.py b/pybar/scans/tune_merged_pixels.py
@@ -72,4 +72,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(MergedPixelsTuning)
+    RunManager('configuration.yaml').run_run(MergedPixelsTuning)
diff --git a/pybar/scans/tune_noise_occupancy.py b/pybar/scans/tune_noise_occupancy.py
@@ -145,4 +145,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(NoiseOccupancyTuning)
+    RunManager('configuration.yaml').run_run(NoiseOccupancyTuning)
diff --git a/pybar/scans/tune_stuck_pixel.py b/pybar/scans/tune_stuck_pixel.py
@@ -76,4 +76,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(StuckPixelScan)
+    RunManager('configuration.yaml').run_run(StuckPixelScan)
diff --git a/pybar/scans/tune_tdac.py b/pybar/scans/tune_tdac.py
@@ -176,4 +176,4 @@ def write_tdac_config(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(TdacTuning)
+    RunManager('configuration.yaml').run_run(TdacTuning)
diff --git a/pybar/scans/tune_threshold_baseline.py b/pybar/scans/tune_threshold_baseline.py
@@ -298,4 +298,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(ThresholdBaselineTuning)
+    RunManager('configuration.yaml').run_run(ThresholdBaselineTuning)
diff --git a/pybar/scans/tune_tlu.py b/pybar/scans/tune_tlu.py
@@ -103,4 +103,4 @@ def analyze(self):
 
 
 if __name__ == "__main__":
-    RunManager('../configuration.yaml').run_run(TluTuning)
+    RunManager('configuration.yaml').run_run(TluTuning)

Original file line number	Diff line number	Diff line change
`@@ -244,4 +244,4 @@ def analyze(self):`
`244`	`244`
`245`	`245`
`246`	`246`	`if __name__ == "__main__":`
`247`		`- RunManager('../configuration.yaml').run_run(HitOrCalibration)`
	`247`	`+ RunManager('configuration.yaml').run_run(HitOrCalibration)`
Original file line number	Diff line number	Diff line change
`@@ -323,4 +323,4 @@ def plateau_fit_fn(x, offset):`
`323`	`323`
`324`	`324`
`325`	`325`	`if __name__ == "__main__":`
`326`		`- RunManager('../configuration.yaml').run_run(PlsrDacCalibration)`
	`326`	`+ RunManager('configuration.yaml').run_run(PlsrDacCalibration)`
Original file line number	Diff line number	Diff line change
`@@ -45,4 +45,4 @@ def analyze(self):`
`45`	`45`
`46`	`46`
`47`	`47`	`if __name__ == "__main__":`
`48`		`- RunManager('../configuration.yaml').run_run(PulserDacCorrectionCalibration)`
	`48`	`+ RunManager('configuration.yaml').run_run(PulserDacCorrectionCalibration)`
Original file line number	Diff line number	Diff line change
`@@ -172,4 +172,4 @@ def analyze(self):`
`172`	`172`
`173`	`173`
`174`	`174`	`if __name__ == "__main__":`
`175`		`- RunManager('../configuration.yaml').run_run(ThresholdCalibration)`
	`175`	`+ RunManager('configuration.yaml').run_run(ThresholdCalibration)`
Original file line number	Diff line number	Diff line change
`@@ -102,4 +102,4 @@ def analyze(self):`
`102`	`102`
`103`	`103`
`104`	`104`	`if __name__ == "__main__":`
`105`		`- RunManager('../configuration.yaml').run_run(TotCalibration)`
	`105`	`+ RunManager('configuration.yaml').run_run(TotCalibration)`
Original file line number	Diff line number	Diff line change
`@@ -77,4 +77,4 @@ def deactivate_tdc(self):`
`77`	`77`
`78`	`78`
`79`	`79`	`if __name__ == "__main__":`
`80`		`- RunManager('../configuration.yaml').run_run(AnalogScan)`
	`80`	`+ RunManager('configuration.yaml').run_run(AnalogScan)`
Original file line number	Diff line number	Diff line change
`@@ -103,4 +103,4 @@ def analyze(self):`
`103`	`103`
`104`	`104`
`105`	`105`	`if __name__ == "__main__":`
`106`		`- RunManager('../configuration.yaml').run_run(CrosstalkScan)`
	`106`	`+ RunManager('configuration.yaml').run_run(CrosstalkScan)`
Original file line number	Diff line number	Diff line change
`@@ -46,4 +46,4 @@ def analyze(self):`
`46`	`46`
`47`	`47`
`48`	`48`	`if __name__ == "__main__":`
`49`		`- RunManager('../configuration.yaml').run_run(DigitalScan)`
	`49`	`+ RunManager('configuration.yaml').run_run(DigitalScan)`