Skip to content

Commit

Permalink
GIT: Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@laborleben
laborleben committed Mar 5, 2018
2 parents 458e5f4 + 3e2715f commit f286c95
Show file tree
Hide file tree
Showing 33 changed files with 33 additions and 33 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2.dev0
3.0.2
2 changes: 1 addition & 1 deletion pybar/scans/calibrate_hit_or.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(HitOrCalibration)
RunManager('configuration.yaml').run_run(HitOrCalibration)
2 changes: 1 addition & 1 deletion pybar/scans/calibrate_plsr_dac.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/calibrate_plsr_dac_transient.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/calibrate_pulser_dac_correction.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(PulserDacCorrectionCalibration)
RunManager('configuration.yaml').run_run(PulserDacCorrectionCalibration)
2 changes: 1 addition & 1 deletion pybar/scans/calibrate_threshold.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,4 +172,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(ThresholdCalibration)
RunManager('configuration.yaml').run_run(ThresholdCalibration)
2 changes: 1 addition & 1 deletion pybar/scans/calibrate_tot.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,4 +102,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(TotCalibration)
RunManager('configuration.yaml').run_run(TotCalibration)
2 changes: 1 addition & 1 deletion pybar/scans/scan_analog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ def deactivate_tdc(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(AnalogScan)
RunManager('configuration.yaml').run_run(AnalogScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_crosstalk.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(CrosstalkScan)
RunManager('configuration.yaml').run_run(CrosstalkScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_digital.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(DigitalScan)
RunManager('configuration.yaml').run_run(DigitalScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_ext_trigger.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/scan_ext_trigger_gdac.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/scan_ext_trigger_stop_mode.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@ def stop_trigger(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(StopModeExtTriggerScan)
RunManager('configuration.yaml').run_run(StopModeExtTriggerScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_fei4_self_trigger.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,4 @@ def stop_trigger(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(Fei4SelfTriggerScan)
RunManager('configuration.yaml').run_run(Fei4SelfTriggerScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_ileak.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(IleakScan)
RunManager('configuration.yaml').run_run(IleakScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_init.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(InitScan)
RunManager('configuration.yaml').run_run(InitScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_iv.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,4 +104,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(IVScan)
RunManager('configuration.yaml').run_run(IVScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_threshold.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(ThresholdScan)
RunManager('configuration.yaml').run_run(ThresholdScan)
2 changes: 1 addition & 1 deletion pybar/scans/scan_threshold_fast.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/test_register.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/test_tdc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(TdcTest)
RunManager('configuration.yaml').run_run(TdcTest)
2 changes: 1 addition & 1 deletion pybar/scans/tune_fdac.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,4 +169,4 @@ def set_start_fdac(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(FdacTuning)
RunManager('configuration.yaml').run_run(FdacTuning)
2 changes: 1 addition & 1 deletion pybar/scans/tune_feedback.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/tune_fei4.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(Fei4Tuning)
RunManager('configuration.yaml').run_run(Fei4Tuning)
2 changes: 1 addition & 1 deletion pybar/scans/tune_gdac.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion pybar/scans/tune_gdac_standard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,4 +196,4 @@ def write_target_threshold(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(GdacTuningStandard)
RunManager('configuration.yaml').run_run(GdacTuningStandard)
2 changes: 1 addition & 1 deletion pybar/scans/tune_hot_pixels.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(HotPixelTuning)
RunManager('configuration.yaml').run_run(HotPixelTuning)
2 changes: 1 addition & 1 deletion pybar/scans/tune_merged_pixels.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(MergedPixelsTuning)
RunManager('configuration.yaml').run_run(MergedPixelsTuning)
2 changes: 1 addition & 1 deletion pybar/scans/tune_noise_occupancy.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(NoiseOccupancyTuning)
RunManager('configuration.yaml').run_run(NoiseOccupancyTuning)
2 changes: 1 addition & 1 deletion pybar/scans/tune_stuck_pixel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(StuckPixelScan)
RunManager('configuration.yaml').run_run(StuckPixelScan)
2 changes: 1 addition & 1 deletion pybar/scans/tune_tdac.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,4 @@ def write_tdac_config(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(TdacTuning)
RunManager('configuration.yaml').run_run(TdacTuning)
2 changes: 1 addition & 1 deletion pybar/scans/tune_threshold_baseline.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,4 +298,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(ThresholdBaselineTuning)
RunManager('configuration.yaml').run_run(ThresholdBaselineTuning)
2 changes: 1 addition & 1 deletion pybar/scans/tune_tlu.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ def analyze(self):


if __name__ == "__main__":
RunManager('../configuration.yaml').run_run(TluTuning)
RunManager('configuration.yaml').run_run(TluTuning)

0 comments on commit f286c95

Please sign in to comment.