From c30a9cae132db4438258df630e744cdb2902b81f Mon Sep 17 00:00:00 2001 From: sfop Date: Wed, 24 Aug 2016 15:28:58 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 10 +++++----- script/Alignment/Gun_solenoid_alignment.py | 2 +- script/ImageStats.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index bc6d606..5944776 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -13,8 +13,8 @@ $gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RS #rf_phase=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:SET-VSUM-PHASE|||true #rf_phase_rb=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:GET-VSUM-PHASE|Read||true #rf_ampl_rb=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:GET-VSUM-AMPLT|Read||true -image=ch.psi.pshell.imaging.FileSource|/afs/psi.ch/intranet/SF/Applications/config/pshell_op/context/beam.jpg||| -cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR350:FPICTURE Int16 5529600||-200| -matrix=ch.psi.pshell.epics.GenericMatrix|SINEG01-DSCR350:FPICTURE 2560 2160||| -cam1=ch.psi.pshell.epics.PsiCamera|SINEG01-DSCR350||-200|false -cam2=ch.psi.pshell.epics.PsiCamera|SINBD01-DSCR010||-200| +#image=ch.psi.pshell.imaging.FileSource|/afs/psi.ch/intranet/SF/Applications/config/pshell_op/context/beam.jpg||| +#cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR350:FPICTURE Int16 5529600||-200| +#matrix=ch.psi.pshell.epics.GenericMatrix|SINEG01-DSCR350:FPICTURE 2560 2160||| +#cam1=ch.psi.pshell.epics.PsiCamera|SINEG01-DSCR350||-200|false +#cam2=ch.psi.pshell.epics.PsiCamera|SINBD01-DSCR010||-200| diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index e961857..d57092c 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -42,7 +42,7 @@ if get_device("image_stats") is None: if (latch): image_stats.start() """ -add_device(ImageStats("image_stats", get_simulated_source()), True) +add_device(ImageStats("image_stats", get_simulated_source(image)), True) image_stats.setNumberOfImages(max(number_images,1)) image_stats.enableBackground (use_background) diff --git a/script/ImageStats.py b/script/ImageStats.py index 7070e78..d3a2277 100644 --- a/script/ImageStats.py +++ b/script/ImageStats.py @@ -115,16 +115,16 @@ class ImageStats(DeviceBase): pass -def get_simulated_source(): +def get_simulated_source(img): simulated_source = SimulatedSource() simulated_source.img=None simulated_source.initialize() - image.addListener(simulated_source) + img.addListener(simulated_source) show_panel(simulated_source) return simulated_source if __name__ == "__builtin__": - simulated_source = get_simulated_source() + simulated_source = get_simulated_source(image) print get_centroid(simulated_source) add_device(ImageStats("image_stats", simulated_source), True)