pshell_config/sf-op
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
sfop
2016-08-24 15:28:58 +02:00
parent 3c6f82b26b
commit c30a9cae13
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/devices.properties
+5 -5
View File
@@ -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|
script/Alignment/Gun_solenoid_alignment.py
+1 -1
View File
@@ -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)
script/ImageStats.py
+3 -3
View File
@@ -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)