diff --git a/config/config.properties b/config/config.properties index 2698b80..865c390 100755 --- a/config/config.properties +++ b/config/config.properties @@ -1,43 +1,56 @@ -#Fri Aug 14 16:52:45 CEST 2020 +#Tue Jul 13 10:23:03 CEST 2021 +autoSaveScanData=true +simulation=false +commandExecutionEvents=false +logDaysToLive=30 +dataScanSaveOutput=false +userAuthenticator= +logLevelConsole=Off +filePermissionsConfig=Default +dataScanStrategy=default +scanStreamerPort=-1 +dataScanSaveScript=false +dataScanSaveSetpoints=false +notifiedTasks=null +parallelInitialization=false +scanDataRelease=false +dataTransferPath=null +scanStreamingPort=-1 +saveConsoleSessionFiles=false +devicePoolFile={config}/devices.properties +versionTrackingManual=true +dataTransferMode=Off hostName= userManagement=false instanceName=OP -autoSaveScanData=true -simulation=false +disableEmbeddedAttributes=false dataServerPort=-1 hideServerMessages=false serverPort=8090 versionTrackingEnabled=true dataPath={data}/{year}/{month}/{day}/{date}_{time}_{name} serverEnabled=true -commandExecutionEvents=false -logDaysToLive=30 dataScanReleaseRecords=false depthDimension=0 dataScanPreserveTypes=false logLevel=Fine -dataScanSaveOutput=false dataScanFlushRecords=false logPath={logs}/{date}_{time} +filePermissionsLogs=Default dataLayout=sf +disableDataFileLogs=false +sessionHandling=Off deviceUpdateStrategyFile={config}/update.properties terminalEnabled=false -notificationLevel=null -userAuthenticator= -logLevelConsole=Off +notificationLevel=Off +filePermissionsScripts=Default terminalPort=3579 tasksFile={config}/tasks.properties -dataScanStrategy=default -scanStreamerPort=-1 -dataScanSaveScript=false -dataScanSaveSetpoints=false -parallelInitialization=false -scanDataRelease=false +dataTransferUser=null +filePermissionsData=Default createSessionFiles=false -scanStreamingPort=-1 versionTrackingLogin={context}/svcusr-hlapp_robot -devicePoolFile={config}/devices.properties -versionTrackingManual=true +noBytecodeFiles=false versionTrackingRemote=git@git.psi.ch\:pshell_config/sf-op.git dataProvider=default saveCommandStatistics=false diff --git a/config/devices.properties b/config/devices.properties index c62be74..c10a674 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,7 +1,7 @@ dispatcher=ch.psi.pshell.bs.Dispatcher|https://dispatcher-api.psi.ch/sf||| cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889||| charge=ch.psi.pshell.epics.ProcessVariable|SINEG01-DICT215:B1_CHARGE_AVERAGE-OP||| -rep_rate=ch.psi.pshell.epics.ProcessVariable|SIN-TIMAST-TMA:Beam-Appl-Freq-RB||| +$rep_rate=ch.psi.pshell.epics.ProcessVariable|SIN-TIMAST-TMA:Beam-Appl-Freq-RB||| destination_AR=ch.psi.pshell.epics.ChannelString|SF:MODE_AR false||| energy_AR=ch.psi.pshell.epics.ProcessVariable|SF:ENERGY_AR||| laser=ch.psi.pshell.epics.ChannelString|SLG-LGEN:WHICH_LASER false||| diff --git a/config/mail.properties b/config/mail.properties old mode 100644 new mode 100755 diff --git a/config/plugins.properties b/config/plugins.properties old mode 100644 new mode 100755 diff --git a/config/settings.properties b/config/settings.properties old mode 100644 new mode 100755 diff --git a/config/setup.properties b/config/setup.properties index 0f12736..c4082f4 100755 --- a/config/setup.properties +++ b/config/setup.properties @@ -1,21 +1,24 @@ -#Fri Sep 06 11:37:43 CEST 2019 -configFile={config}/config.properties +#Wed Mar 03 11:49:30 CET 2021 +scriptPath={home}/script +sessionsPath={outp}/sessions +pluginsPath={home}/plugins configFileDevices={config}/devices.properties +consoleSessionsPath={sessions}/console +libraryPath={script}; {script}/Lib configFilePlugins={config}/plugins.properties -configFileSettings={config}/settings.properties -configFileTasks={config}/tasks.properties -configFileUpdateStrategy={config}/update.properties -configFileVariables={config}/variables.properties -configPath={home}/config contextPath={outp}/context +extensionsPath={home}/extensions +configFileUpdateStrategy={config}/update.properties +configPath={home}/config +configFileSessions={config}/sessions.properties +userSessionsPath={sessions}/user dataPath={outp}/data devicesPath={home}/devices -extensionsPath={home}/extensions -imagesPath={data}/{year}/{month}/{day} -libraryPath={script}; {script}/Lib +configFileVariables={config}/variables.properties +configFileSettings={config}/settings.properties logPath={outp}/log -pluginsPath={home}/plugins -scriptPath={home}/script -scriptType=py -sessionsPath={outp}/sessions wwwPath={home}/www +configFile={config}/config.properties +imagesPath={data}/{year}/{month}/{day} +scriptType=py +configFileTasks={config}/tasks.properties diff --git a/config/tasks.properties b/config/tasks.properties old mode 100644 new mode 100755 index a1bc59b..de7107a --- a/config/tasks.properties +++ b/config/tasks.properties @@ -1 +1,2 @@ -Correlation/correlation_stream=-1.0 +#Correlation/correlation_stream=-1.0;1.0 +Correlation/correlation_stream_mult=3.0;1.0 diff --git a/config/variables.properties b/config/variables.properties old mode 100644 new mode 100755 index acf1334..854ab80 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,4 @@ -#Wed Feb 24 10:42:43 CET 2021 -FileSequentialNumber=4432 +#Tue Aug 17 13:49:51 CEST 2021 +LastRunDate=210817 +FileSequentialNumber=5531 +DaySequentialNumber=1 diff --git a/devices/Beam phase.properties b/devices/Beam phase.properties old mode 100644 new mode 100755 diff --git a/devices/CamServer.properties b/devices/CamServer.properties old mode 100644 new mode 100755 diff --git a/devices/Camera Server.properties b/devices/Camera Server.properties old mode 100644 new mode 100755 diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties old mode 100644 new mode 100755 index 8871732..34d5ee1 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,6 +1,4 @@ -#Wed Feb 24 10:45:54 CET 2021 -\u0000\u0000\u0000\u0000\u0000\u0000= -\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000= +#Tue Aug 17 09:29:56 CEST 2021 \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000= \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000= \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000= @@ -10,36 +8,39 @@ \u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000= \u0000= \u0000\u0000\u0000\u0000= +\u0000\u0000\u0000\u0000\u0000\u0000= +\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000\u0000= colormapLogarithmic=false -spatialCalScaleX=-27.972029584893434 -spatialCalScaleY=-27.855154398999183 +spatialCalScaleX=-35.21126887460907 +spatialCalScaleY=-48.38709552593848 serverURL=null rescaleOffset=0.0 roiWidth=-1 -colormap=Flame -imageWidth=1920 +colormap=Rainbow +imageWidth=2560 invert=false -colormapMin=77.0 +colormapMin=100.0 rotationCrop=false roiHeight=-1 colormapAutomatic=true roiY=0 roiX=0 -spatialCalOffsetY=-91.59477274098214 -spatialCalOffsetX=-132.60829335501532 +spatialCalOffsetY=-483.5036425564949 +spatialCalOffsetX=-637.4980411378614 scale=1.0 regionStart= grayscale=false -colormapMax=878.0 +rtY=1 +colormapMax=3000.0 spat= rotation=0.0 rescaleFactor=1.0 -imageHeight=1200 +imageHeight=2160 spatialCalUnits=null flipVertically=false r= t= flipHorizontally=false transpose=false -regionStartX=8 -regionStartY=8 +regionStartX=1 +regionStartY=1 diff --git a/devices/DLAC motor.properties b/devices/DLAC motor.properties old mode 100644 new mode 100755 diff --git a/devices/DummyMotor.properties b/devices/DummyMotor.properties old mode 100644 new mode 100755 diff --git a/devices/Gain.properties b/devices/Gain.properties old mode 100644 new mode 100755 diff --git a/devices/Gun Phase.properties b/devices/Gun Phase.properties old mode 100644 new mode 100755 diff --git a/devices/Image Averager.properties b/devices/Image Averager.properties old mode 100644 new mode 100755 diff --git a/devices/Motor.properties b/devices/Motor.properties old mode 100644 new mode 100755 diff --git a/devices/Phase.properties b/devices/Phase.properties old mode 100644 new mode 100755 diff --git a/devices/S10BC01-MQUA100.properties b/devices/S10BC01-MQUA100.properties old mode 100644 new mode 100755 diff --git a/devices/S10BC02-DSCR220.properties b/devices/S10BC02-DSCR220.properties old mode 100644 new mode 100755 diff --git a/devices/S10BC02-DSRM310.properties b/devices/S10BC02-DSRM310.properties old mode 100644 new mode 100755 diff --git a/devices/S10BD01-DSCR030.properties b/devices/S10BD01-DSCR030.properties old mode 100644 new mode 100755 diff --git a/devices/S10CB01-MQUA430.properties b/devices/S10CB01-MQUA430.properties old mode 100644 new mode 100755 diff --git a/devices/S10CB02-MQUA230.properties b/devices/S10CB02-MQUA230.properties old mode 100644 new mode 100755 diff --git a/devices/S10CB06-RMOD:FIL-I-SET.properties b/devices/S10CB06-RMOD:FIL-I-SET.properties new file mode 100644 index 0000000..c83dac2 --- /dev/null +++ b/devices/S10CB06-RMOD:FIL-I-SET.properties @@ -0,0 +1,10 @@ +#Wed Aug 11 14:04:50 CEST 2021 +minValue=NaN +unit=null +offset=0.0 +maxValue=NaN +rotation=false +precision=-1 +sign_bit=0 +scale=1.0 +resolution=NaN diff --git a/devices/S10CB09-RSYS:SET-VSUM-PHASE.properties b/devices/S10CB09-RSYS:SET-VSUM-PHASE.properties old mode 100644 new mode 100755 diff --git a/devices/S10DI01-DSCR020.properties b/devices/S10DI01-DSCR020.properties old mode 100644 new mode 100755 diff --git a/devices/S10MA01-DSCR090.properties b/devices/S10MA01-DSCR090.properties old mode 100644 new mode 100755 diff --git a/devices/S20SY01-MQUA080.properties b/devices/S20SY01-MQUA080.properties old mode 100644 new mode 100755 diff --git a/devices/S20SY01.MQUA080.properties b/devices/S20SY01.MQUA080.properties old mode 100644 new mode 100755 diff --git a/devices/SARBD01-DSCR050.properties b/devices/SARBD01-DSCR050.properties old mode 100644 new mode 100755 diff --git a/devices/SARBD01-DSCR110.properties b/devices/SARBD01-DSCR110.properties old mode 100644 new mode 100755 diff --git a/devices/SARMA01-MQUA010.properties b/devices/SARMA01-MQUA010.properties old mode 100644 new mode 100755 diff --git a/devices/SARMA01-MQUA10.properties b/devices/SARMA01-MQUA10.properties old mode 100644 new mode 100755 diff --git a/devices/SINDI02-DBLM084:M06-1-ATT2-VAL.properties b/devices/SINDI02-DBLM084:M06-1-ATT2-VAL.properties old mode 100644 new mode 100755 diff --git a/devices/SINEG01-DBPM340.properties b/devices/SINEG01-DBPM340.properties old mode 100644 new mode 100755 diff --git a/devices/SINEG01-DSCR190.properties b/devices/SINEG01-DSCR190.properties old mode 100644 new mode 100755 diff --git a/devices/SINEG01-DSCR350.properties b/devices/SINEG01-DSCR350.properties old mode 100644 new mode 100755 diff --git a/devices/SINEG01-RSYS:SET-BEAM-PHASE-SIM.properties b/devices/SINEG01-RSYS:SET-BEAM-PHASE-SIM.properties old mode 100644 new mode 100755 diff --git a/devices/SINEG01-RSYS:SET-BEAM-PHASE.properties b/devices/SINEG01-RSYS:SET-BEAM-PHASE.properties old mode 100644 new mode 100755 diff --git a/devices/SLG-LCAM-C041.properties b/devices/SLG-LCAM-C041.properties old mode 100644 new mode 100755 diff --git a/devices/SLG-LCAM-C042.properties b/devices/SLG-LCAM-C042.properties old mode 100644 new mode 100755 diff --git a/devices/SLG-LCAM-L122.properties b/devices/SLG-LCAM-L122.properties old mode 100644 new mode 100755 diff --git a/devices/SLG-LCAM-L123.properties b/devices/SLG-LCAM-L123.properties old mode 100644 new mode 100755 diff --git a/devices/SLG-LCAM-L124.properties b/devices/SLG-LCAM-L124.properties old mode 100644 new mode 100755 diff --git a/devices/STEST01-RSYS:SET-VSUM-PHASE.properties b/devices/STEST01-RSYS:SET-VSUM-PHASE.properties old mode 100644 new mode 100755 diff --git a/devices/SimMotor.properties b/devices/SimMotor.properties old mode 100644 new mode 100755 diff --git a/devices/Test.properties b/devices/Test.properties old mode 100644 new mode 100755 diff --git a/devices/Time.properties b/devices/Time.properties old mode 100644 new mode 100755 diff --git a/devices/WireScanner motor.properties b/devices/WireScanner motor.properties old mode 100644 new mode 100755 index da88a1f..c8085aa --- a/devices/WireScanner motor.properties +++ b/devices/WireScanner motor.properties @@ -1,4 +1,4 @@ -#Mon Nov 30 03:01:09 CET 2020 +#Tue Aug 17 13:49:50 CEST 2021 offset=0.0 maxValue=51500.0 precision=1 @@ -9,10 +9,10 @@ maxSpeed=2000.0 resolution=0.1 homingType=None startRetries=1 -minValue=-56937.0 +minValue=-56300.0 unit=um defaultSpeed=2000.0 hasEnable=false sign_bit=0 monitorByPosition=false -minSpeed=1.0 +minSpeed=50.0 diff --git a/devices/c.properties b/devices/c.properties old mode 100644 new mode 100755 diff --git a/devices/cam.properties b/devices/cam.properties old mode 100644 new mode 100755 diff --git a/devices/cam1.properties b/devices/cam1.properties old mode 100644 new mode 100755 diff --git a/devices/cam2.properties b/devices/cam2.properties old mode 100644 new mode 100755 diff --git a/devices/cam3.properties b/devices/cam3.properties old mode 100644 new mode 100755 diff --git a/devices/cam_server provider.properties b/devices/cam_server provider.properties old mode 100644 new mode 100755 diff --git a/devices/cam_server.properties b/devices/cam_server.properties old mode 100644 new mode 100755 index 6fc7257..e18d2b9 --- a/devices/cam_server.properties +++ b/devices/cam_server.properties @@ -1,11 +1,11 @@ -#Mon May 04 11:45:54 CEST 2020 -spatialCalOffsetY=-820.4883730911062 -spatialCalOffsetX=-861.4939970777481 +#Fri Aug 06 14:12:08 CEST 2021 +spatialCalOffsetY=-50.048780487804876 +spatialCalOffsetX=-50.03903200624512 colormapLogarithmic=false scale=1.0 grayscale=false -spatialCalScaleX=-18.90359092620482 -spatialCalScaleY=-19.37984500632817 +spatialCalScaleX=-1.0 +spatialCalScaleY=-1.0 colormapMax=NaN rescaleOffset=0.0 roiWidth=-1 diff --git a/devices/camtool.properties b/devices/camtool.properties old mode 100644 new mode 100755 diff --git a/devices/charge.properties b/devices/charge.properties old mode 100644 new mode 100755 diff --git a/devices/dispatcher.properties b/devices/dispatcher.properties old mode 100644 new mode 100755 diff --git a/devices/energy_AR.properties b/devices/energy_AR.properties old mode 100644 new mode 100755 diff --git a/devices/energy_B1.properties b/devices/energy_B1.properties old mode 100644 new mode 100755 diff --git a/devices/fampltms.properties b/devices/fampltms.properties old mode 100644 new mode 100755 diff --git a/devices/gain 1.properties b/devices/gain 1.properties old mode 100644 new mode 100755 diff --git a/devices/gain 2.properties b/devices/gain 2.properties old mode 100644 new mode 100755 diff --git a/devices/gain.properties b/devices/gain.properties old mode 100644 new mode 100755 diff --git a/devices/gsrx.properties b/devices/gsrx.properties old mode 100644 new mode 100755 diff --git a/devices/gsry.properties b/devices/gsry.properties old mode 100644 new mode 100755 diff --git a/devices/gsx.properties b/devices/gsx.properties old mode 100644 new mode 100755 diff --git a/devices/gsy.properties b/devices/gsy.properties old mode 100644 new mode 100755 diff --git a/devices/gun_solenoid.properties b/devices/gun_solenoid.properties old mode 100644 new mode 100755 diff --git a/devices/image.properties b/devices/image.properties old mode 100644 new mode 100755 diff --git a/devices/image_stats.properties b/devices/image_stats.properties old mode 100644 new mode 100755 diff --git a/devices/kick.properties b/devices/kick.properties old mode 100644 new mode 100755 diff --git a/devices/kick1.properties b/devices/kick1.properties old mode 100644 new mode 100755 diff --git a/devices/kick2.properties b/devices/kick2.properties old mode 100644 new mode 100755 diff --git a/devices/kick3.properties b/devices/kick3.properties old mode 100644 new mode 100755 diff --git a/devices/matrix.properties b/devices/matrix.properties old mode 100644 new mode 100755 diff --git a/devices/pbpg_mx.properties b/devices/pbpg_mx.properties old mode 100644 new mode 100755 diff --git a/devices/pbpg_my.properties b/devices/pbpg_my.properties old mode 100644 new mode 100755 diff --git a/devices/pipeline_server.properties b/devices/pipeline_server.properties old mode 100644 new mode 100755 diff --git a/devices/positioner.properties b/devices/positioner.properties old mode 100644 new mode 100755 diff --git a/devices/quad.properties b/devices/quad.properties old mode 100644 new mode 100755 diff --git a/devices/rep_rate.properties b/devices/rep_rate.properties old mode 100644 new mode 100755 diff --git a/devices/rot 1.properties b/devices/rot 1.properties old mode 100644 new mode 100755 diff --git a/devices/scanner.properties b/devices/scanner.properties old mode 100644 new mode 100755 diff --git a/devices/sf-daqsync-01:8888.properties b/devices/sf-daqsync-01:8888.properties old mode 100644 new mode 100755 diff --git a/devices/sflca.properties b/devices/sflca.properties old mode 100644 new mode 100755 diff --git a/devices/sflca:10000.properties b/devices/sflca:10000.properties old mode 100644 new mode 100755 diff --git a/devices/test/positioner.properties b/devices/test/positioner.properties old mode 100644 new mode 100755 diff --git a/docker/Dockerfile b/docker/Dockerfile old mode 100644 new mode 100755 diff --git a/docker/build.sh b/docker/build.sh old mode 100644 new mode 100755 diff --git a/docker/start.sh b/docker/start.sh old mode 100644 new mode 100755 diff --git a/docker/stop.sh b/docker/stop.sh old mode 100644 new mode 100755 diff --git a/docker/wb.sh b/docker/wb.sh old mode 100644 new mode 100755 diff --git a/plugins/CameraCalibrationDialog.form b/plugins/CameraCalibrationDialog.form old mode 100644 new mode 100755 diff --git a/plugins/CameraCalibrationDialog.java b/plugins/CameraCalibrationDialog.java old mode 100644 new mode 100755 diff --git a/plugins/CameraConfigDialog.form b/plugins/CameraConfigDialog.form old mode 100644 new mode 100755 diff --git a/plugins/CameraConfigDialog.java b/plugins/CameraConfigDialog.java old mode 100644 new mode 100755 diff --git a/plugins/Cameras.form b/plugins/Cameras.form old mode 100644 new mode 100755 diff --git a/plugins/Cameras.java b/plugins/Cameras.java old mode 100644 new mode 100755 diff --git a/plugins/Camtool.java b/plugins/Camtool.java old mode 100644 new mode 100755 diff --git a/plugins/Correlation.form b/plugins/Correlation.form old mode 100644 new mode 100755 diff --git a/plugins/Correlation.java b/plugins/Correlation.java old mode 100644 new mode 100755 diff --git a/plugins/Correlation2.form b/plugins/Correlation2.form old mode 100644 new mode 100755 diff --git a/plugins/Correlation2.java b/plugins/Correlation2.java old mode 100644 new mode 100755 diff --git a/plugins/GunEnergyScan.form b/plugins/GunEnergyScan.form old mode 100644 new mode 100755 diff --git a/plugins/GunEnergyScan.java b/plugins/GunEnergyScan.java old mode 100644 new mode 100755 diff --git a/plugins/GunEnergyScanNew.form b/plugins/GunEnergyScanNew.form old mode 100644 new mode 100755 diff --git a/plugins/GunEnergyScanNew.java b/plugins/GunEnergyScanNew.java old mode 100644 new mode 100755 diff --git a/plugins/GunSolenoidAlignment.form b/plugins/GunSolenoidAlignment.form old mode 100644 new mode 100755 diff --git a/plugins/GunSolenoidAlignment.java b/plugins/GunSolenoidAlignment.java old mode 100644 new mode 100755 diff --git a/plugins/Inventory.java b/plugins/Inventory.java old mode 100644 new mode 100755 diff --git a/plugins/LaserGunAlignment.form b/plugins/LaserGunAlignment.form old mode 100644 new mode 100755 diff --git a/plugins/LaserGunAlignment.java b/plugins/LaserGunAlignment.java old mode 100644 new mode 100755 diff --git a/plugins/SchottkyScan.form b/plugins/SchottkyScan.form old mode 100644 new mode 100755 diff --git a/plugins/SchottkyScan.java b/plugins/SchottkyScan.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel.form b/plugins/ScreenPanel.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel.java b/plugins/ScreenPanel.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel2.form b/plugins/ScreenPanel2.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel2.java b/plugins/ScreenPanel2.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel3.form b/plugins/ScreenPanel3.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel3.java b/plugins/ScreenPanel3.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel4.form b/plugins/ScreenPanel4.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel4.java b/plugins/ScreenPanel4.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel5.form b/plugins/ScreenPanel5.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel5.java b/plugins/ScreenPanel5.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel6.form b/plugins/ScreenPanel6.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanel6.java b/plugins/ScreenPanel6.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanelBack.form b/plugins/ScreenPanelBack.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanelBack.java b/plugins/ScreenPanelBack.java old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanelOld.form b/plugins/ScreenPanelOld.form old mode 100644 new mode 100755 diff --git a/plugins/ScreenPanelOld.java b/plugins/ScreenPanelOld.java old mode 100644 new mode 100755 diff --git a/plugins/SfCamera.java b/plugins/SfCamera.java old mode 100644 new mode 100755 diff --git a/plugins/Tst.form b/plugins/Tst.form old mode 100644 new mode 100755 diff --git a/plugins/Tst.java b/plugins/Tst.java old mode 100644 new mode 100755 diff --git a/plugins/WireScan.form b/plugins/WireScan.form old mode 100644 new mode 100755 diff --git a/plugins/WireScan.java b/plugins/WireScan.java old mode 100644 new mode 100755 diff --git a/plugins/WireScanCalibration.form b/plugins/WireScanCalibration.form old mode 100644 new mode 100755 diff --git a/plugins/WireScanCalibration.java b/plugins/WireScanCalibration.java old mode 100644 new mode 100755 diff --git a/plugins/back/ScreenPanel.form b/plugins/back/ScreenPanel.form old mode 100644 new mode 100755 diff --git a/plugins/back/ScreenPanel.java b/plugins/back/ScreenPanel.java old mode 100644 new mode 100755 diff --git a/plugins/ch.psi.pshell.ui.Panel b/plugins/ch.psi.pshell.ui.Panel old mode 100644 new mode 100755 diff --git a/plugins/resources/Background.png b/plugins/resources/Background.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Fit.png b/plugins/resources/Fit.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Marker.png b/plugins/resources/Marker.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Profile.png b/plugins/resources/Profile.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Reticule.png b/plugins/resources/Reticule.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Save.png b/plugins/resources/Save.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Scale.png b/plugins/resources/Scale.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Sidebar.png b/plugins/resources/Sidebar.png old mode 100644 new mode 100755 diff --git a/plugins/resources/Title.png b/plugins/resources/Title.png old mode 100644 new mode 100755 diff --git a/script/Alignment/BPM_quad_alignment.py b/script/Alignment/BPM_quad_alignment.py old mode 100644 new mode 100755 diff --git a/script/Alignment/Optimization_search.py b/script/Alignment/Optimization_search.py old mode 100644 new mode 100755 diff --git a/script/CPython/extremum.py b/script/CPython/extremum.py old mode 100644 new mode 100755 diff --git a/script/CPython/gfitoff.py b/script/CPython/gfitoff.py old mode 100644 new mode 100755 diff --git a/script/CPython/hfitoff.py b/script/CPython/hfitoff.py old mode 100644 new mode 100755 diff --git a/script/CPython/linfit.py b/script/CPython/linfit.py old mode 100644 new mode 100755 diff --git a/script/CPython/wrapper.py b/script/CPython/wrapper.py old mode 100644 new mode 100755 diff --git a/script/Correlation/Correlation.py b/script/Correlation/Correlation.py old mode 100644 new mode 100755 diff --git a/script/Correlation/Correlation2.py b/script/Correlation/Correlation2.py old mode 100644 new mode 100755 diff --git a/script/Correlation/CorrelationStream.py b/script/Correlation/CorrelationStream.py new file mode 100755 index 0000000..9ee8c02 --- /dev/null +++ b/script/Correlation/CorrelationStream.py @@ -0,0 +1,174 @@ + +class CorrelationStream(): + def __init__(self, prefix="SLAAR-LBSTREAM1", verbose=False, interval=1.0, empty_value = 1112223330): + self.prefix = prefix + self.verbose = verbose + self.interval = interval + self.empty_value = empty_value + if self.prefix != ":": + self.prefix = self.prefix + ":" + + self.t0=None + self.pid=None + + self.st=None + self.running = False + self.task=None + + + def get_channel_list(self): + ch=[] + try: + for i in range(20): + v= caget(self.prefix + "NAME" + str(i+1)) + if v.strip()=="": + break + ch.append(str(v.strip())) + except: + pass + return ch + + def ack_channel_list(self, channel_list): + try: + s="" + for c in channel_list: + s=s+c+"\n" + s=s+"\x00" + caput(self.prefix + "PACK_LIST",[ord(c) for c in s]) + except: + pass + + def start_stream(self, channel_list): + try: + self.st=None + print "Starting stream" + if len(channel_list)==0: + raise Exception ("No channel defined") + self. st = Stream("pulse_id", dispatcher) + self.st.setIncomplete("fill_null") + for c in channel_list: + self.st.addScalar(c, c, 1, 0) + self.st.initialize() + self.st.start() + self.st.waitCacheChange(10000) #Wait stream be running before starting scan + if self.st.take() is None: + raise Exception("Error initializing data stream") + self.ack_channel_list(channel_list) + print "Stream started" + except: + self.stop_stream() + self.st=None + print sys.exc_info()[1] + + def stop_stream(self): + try: + if self.st: + self.st.close() + print "Stream closed" + except: + print sys.exc_info()[1] + finally: + self.st=None + self.ack_channel_list([]) + + def handle_message(self, msg, channel_list, buf): + if self.t0 is None: + self.t0 = time.time() + now=time.time() + num_channels = len(channel_list) + size_buffer= 300 #int((len(buf)-100)/(len(channel_list)+1)) + buf[0] = msg.pulseId + buf[1] = num_channels + buf[4] = self.empty_value + #if (self.pid is not None) and ((self.pid+1) != msg.pulseId): + # print "Missing pid: ", (self.pid+1) + self.pid = msg.pulseId + #Count + if buf[2] < size_buffer: + buf[2] = buf[2]+1 + #Index + buf[3] = buf[3]+1 + if buf[3] == size_buffer: + buf[3]=0 + index = int(buf[3])*(num_channels+1) + 10 + buf[index] = msg.pulseId + index = index+1 + for v in msg.values(): + buf[index] = self.empty_value if ((v is None) or (math.isnan(v)))else v + index = index+1 + if now >= (self.t0 + self.interval): + if self.verbose: + print self.prefix, ":", to_list(buf[0:5]) + self.t0 = time.time() + return True + return False + + + def _run(self): + print "Start running correlation stream " + str(self.prefix) + channel_list = [] + + try: + start_channel = Channel(self.prefix + "START_STOP", type = 'i') + output_channel = Channel(self.prefix + "PACK_DATA", type = '[d') + buf = to_array([0]*output_channel.get_size(),'d') + while self.running: + started = (start_channel.get()==1) + if started and not self.st: + print "Started" + buf[2] = 0 + buf[3]= -1 + channel_list=self.get_channel_list() + print "Channel list: ", channel_list + self.start_stream(channel_list) + if self.st is not None: + class StreamListener (DeviceListener): + def __init__(self, parent): + self.parent=parent + def onValueChanged(self, device, value, former): + if self.parent.handle_message(value, channel_list, buf): + output_channel.putq(buf) + listener = StreamListener(self) + self.st.addListener(listener) + + elif self.st and not started: + print "Stopped" + channel_list=[] + self.stop_stream() + time.sleep(0.1) + except: + print sys.exc_info()[1] + finally: + print "Stop running correlation stream " + str(self.prefix) + self.stop_stream() + if output_channel: output_channel.close() + if start_channel: start_channel.close() + self.running = False + + def run(self): + if self.running: + return + self.running = True + self.task = fork(self._run)[0] + + def stop(self): + if self.running: + self.running = False + if (self.task is not None): + print "Waiting correlation stream thread to stop..." + join([self.task,]) + print "Done" + + def is_running(self): + return (self.task is not None) and not (self.task.isDone()) + + +if False: + cs = CorrelationStream(prefix="SLAAR-LBSTREAM2") + cs.run() + try: + while (cs.running): + time.sleep(0.10) + finally: + cs.stop() + \ No newline at end of file diff --git a/script/Correlation/correlation_stream.py b/script/Correlation/correlation_stream.py old mode 100644 new mode 100755 index 597b226..3555031 --- a/script/Correlation/correlation_stream.py +++ b/script/Correlation/correlation_stream.py @@ -46,8 +46,9 @@ def start_stream(channel_list): st=None print "Starting stream" if len(channel_list)==0: - raise Exception ("No channel defined") + raise Exception ("No channel defined") st = Stream("pulse_id", dispatcher) + st.setIncomplete("fill_null") for c in channel_list: st.addScalar(c, c, 1, 0) st.initialize() @@ -113,51 +114,48 @@ def handle_message(msg, channel_list, buf): return True return False -def run(): - channel_list = [] - st=None - start = Channel(PREFIX + "START_STOP", type = 'i') - outp = Channel(PREFIX + "PACK_DATA", type = '[d') - buf = to_array([0]*outp.get_size(),'d') - buf[2] = 0 - buf[3]= -1 +channel_list = [] +st=None +start = Channel(PREFIX + "START_STOP", type = 'i') +outp = Channel(PREFIX + "PACK_DATA", type = '[d') +buf = to_array([0]*outp.get_size(),'d') - try: - while True: - started = (start.get()==1) - if started and not st: - print "Started" - channel_list=get_channel_list() - print "Channel list: ", channel_list - st = start_stream(channel_list) - if st is not None: - class StreamListener (DeviceListener): - def onValueChanged(self, device, value, former): - if handle_message(value, channel_list, buf): - outp.putq(buf) - listener = StreamListener() - st.addListener(listener) - - elif st and not started: - print "Stopped" - channel_list=[] - stop_stream(st) - st = None - """ - if st: - st.waitCacheChange(0) - if handle_message(st.take(), channel_list, buf): - outp.putq(buf) - time.sleep(0.001) - else: - time.sleep(0.1) - """ - time.sleep(0.1) - finally: - stop_stream(st) - if outp: outp.close() - if start: start.close() +try: + while True: + started = (start.get()==1) + if started and not st: + print "Started" + buf[2] = 0 + buf[3]= -1 + channel_list=get_channel_list() + print "Channel list: ", channel_list + st = start_stream(channel_list) + if st is not None: + class StreamListener (DeviceListener): + def onValueChanged(self, device, value, former): + if handle_message(value, channel_list, buf): + outp.putq(buf) + listener = StreamListener() + st.addListener(listener) + + elif st and not started: + print "Stopped" + channel_list=[] + stop_stream(st) + st = None + """ + if st: + st.waitCacheChange(0) + if handle_message(st.take(), channel_list, buf): + outp.putq(buf) + time.sleep(0.001) + else: + time.sleep(0.1) + """ + time.sleep(0.1) +finally: + stop_stream(st) + if outp: outp.close() + if start: start.close() - -if __name__ == "__main__": - run() \ No newline at end of file + \ No newline at end of file diff --git a/script/Correlation/correlation_stream_mult.py b/script/Correlation/correlation_stream_mult.py new file mode 100755 index 0000000..5f3b3e9 --- /dev/null +++ b/script/Correlation/correlation_stream_mult.py @@ -0,0 +1,18 @@ +run("Correlation/CorrelationStream") + + +correlation_endstations=["SLAAR-LBSTREAM1","SLAAR-LBSTREAM2", "SLAAR-LBSTREAM3", "SLAAR-LBSTREAM4", "SLAAR-LBSTREAM5", "SLAAR-LBSTREAM6"] +correlation_streams = [] + +for es in correlation_endstations: + correlation_streams.append(CorrelationStream(es)) + +try: + while (True): + for cs in correlation_streams: + if not cs.is_running(): + cs.run() + time.sleep(10.0) +finally: + for cs in correlation_streams: + cs.stop() \ No newline at end of file diff --git a/script/Devices/BpmStats.py b/script/Devices/BpmStats.py old mode 100644 new mode 100755 diff --git a/script/Devices/DLAC.py b/script/Devices/DLAC.py old mode 100644 new mode 100755 diff --git a/script/Devices/Elements.py b/script/Devices/Elements.py old mode 100644 new mode 100755 diff --git a/script/Devices/ImageStats.py b/script/Devices/ImageStats.py old mode 100644 new mode 100755 diff --git a/script/Devices/WireScanner.py b/script/Devices/WireScanner.py old mode 100644 new mode 100755 diff --git a/script/Devices/camtool.py b/script/Devices/camtool.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/AnalysisWireScan.py b/script/Diagnostics/AnalysisWireScan.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/BlmGainScan.py b/script/Diagnostics/BlmGainScan.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/BlmGainScan_1406.py b/script/Diagnostics/BlmGainScan_1406.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/BlmGainScan_v2.py b/script/Diagnostics/BlmGainScan_v2.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/Blm_WF_Plot.py b/script/Diagnostics/Blm_WF_Plot.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/CamtoolScan.py b/script/Diagnostics/CamtoolScan.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/Camtoolreadout_for_WSC_comparison.py b/script/Diagnostics/Camtoolreadout_for_WSC_comparison.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/DLACScan.py b/script/Diagnostics/DLACScan.py old mode 100644 new mode 100755 index 674aad4..54e2d51 --- a/script/Diagnostics/DLACScan.py +++ b/script/Diagnostics/DLACScan.py @@ -58,7 +58,7 @@ park_pos = caget (prefix + ":P0_U0_SP") #List of stream channels -channels = [] #[("m_pos", scanner.motor_bs_readback.getName()), ] +channels = [] #[("m_pos", scanner.motor_bs_readback.get_channel_name()), ] for i in range (len(blms)): channels.append (("blm" + str(i+1), blms[i] + ":B1_LOSS")) series = LinePlotSeries(blms[i], None, min(i+1, 2)) diff --git a/script/Diagnostics/ICTScan_1406.py b/script/Diagnostics/ICTScan_1406.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/ICT_timing_fine.py b/script/Diagnostics/ICT_timing_fine.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/ICT_timing_rough.py b/script/Diagnostics/ICT_timing_rough.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/Laser_position_scan.py b/script/Diagnostics/Laser_position_scan.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/ParkAllWireScanners.py b/script/Diagnostics/ParkAllWireScanners.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/Quick_GunScan.py b/script/Diagnostics/Quick_GunScan.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/WireScan.py b/script/Diagnostics/WireScan.py old mode 100644 new mode 100755 index c19b67d..0b7b40d --- a/script/Diagnostics/WireScan.py +++ b/script/Diagnostics/WireScan.py @@ -26,7 +26,7 @@ plt = args[8] if has_args else plot(None, title = "Wire Scan")[0] save_raw = args[9] if has_args else False bunch = args[10] if has_args else 1 adaptive = args[11] if has_args else 1 #0=Off, 1=Gain, 2=Gain+range -filter_beam_ok = (args[12] if has_args else True) if len(args)>12 else True +filter_beam_ok = (args[12] if (has_args and len(args)>12) else True) do_elog = True if (has_args and (not is_embedded) and (plt is not None)) else False print has_args, is_embedded, do_elog @@ -83,9 +83,9 @@ if prefix not in get_wire_scanners(): scanner = WireScanner(prefix, scan_range, cycles, None, True) #List of stream channels -channels = [("m_pos", scanner.motor_bs_readback.getName()), - ("cur_cycle", scanner.curr_cycl.getName()), - ("scanning", scanner.status_channels[0].getName())] +channels = [("m_pos", scanner.motor_bs_readback.get_channel_name()), + ("cur_cycle", scanner.curr_cycl.get_channel_name()), + ("scanning", scanner.status_channels[0].get_channel_name())] for i in range (len(blms)): channels.append (("blm" + str(i+1), blms[i] + ":B" + str(bunch) + "_LOSS")) @@ -296,7 +296,11 @@ def calculate(): for i in range(len(blms)): msg += "Wire " + wire + " - BLM " + str(i+1) + ":\n" try: - bg = get_attributes("background/data/blm" + str(i+1))["Mean"] if bkgrd>0 else 0.0 + blm_back_path = "background/data/blm" + str(i+1) + print "BLM path: ", blm_back_path + blm_back_attrs = get_attributes(blm_back_path) + print "BLM attrs: ", blm_back_attrs + bg = blm_back_attrs["Mean"] if bkgrd>0 else 0.0 samples = [[], [], [], [], [], []] for cycle in range (cycles): pos_path = wire+"_" + ("%04d" % (cycle+1)) + "/data/w_pos" @@ -459,7 +463,7 @@ try: st.getChild("blm1_ws_mode").waitValue(1, SET_BLM_WS_BS_READBACK_TIMEOUT) print "Reading background..." do_background() - stream_filter = scanner.curr_cycl.getName() + ">0" + stream_filter = scanner.curr_cycl.get_channel_name() + ">0" if filter_beam_ok: stream_filter = stream_filter + " AND " + get_beam_ok_channel(bunch) + " == 1" st.setFilter(stream_filter) @@ -468,6 +472,9 @@ try: if scan_type in [WireScanner.Set1, WireScanner.Set2]: print "Executing scan 2..." do_scan(1) +except: + print >> sys.stderr, traceback.format_exc() + raise finally: try: scanner.park(wait=False) diff --git a/script/Diagnostics/WireScanBack.py b/script/Diagnostics/WireScanBack.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/WireScanBack2.py b/script/Diagnostics/WireScanBack2.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/WireScanBackground.py b/script/Diagnostics/WireScanBackground.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/WireScanCalibration.py b/script/Diagnostics/WireScanCalibration.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/WireScannersStatus.py b/script/Diagnostics/WireScannersStatus.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/sig_process.py b/script/Diagnostics/sig_process.py old mode 100644 new mode 100755 diff --git a/script/Diagnostics/sig_process_wrapper.py b/script/Diagnostics/sig_process_wrapper.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/181011_1004_MKDCscanAllAT.py b/script/GenericScans/181011_1004_MKDCscanAllAT.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/181011_1011_MKDCACscanAllAT.py b/script/GenericScans/181011_1011_MKDCACscanAllAT.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/190124_orbitScanCDR.py b/script/GenericScans/190124_orbitScanCDR.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/190124_orbitScanCDR2D.py b/script/GenericScans/190124_orbitScanCDR2D.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/190430_phiKscan.py b/script/GenericScans/190430_phiKscan.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/190502_undXscan.py b/script/GenericScans/190502_undXscan.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/190614_MKscan.py b/script/GenericScans/190614_MKscan.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/191007_MKscan.py b/script/GenericScans/191007_MKscan.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/200928_MKscan.py b/script/GenericScans/200928_MKscan.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/210221_MKphasing.py b/script/GenericScans/210221_MKphasing.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/2Dscan01.py b/script/GenericScans/2Dscan01.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/MKscan.py b/script/GenericScans/MKscan.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan.py b/script/GenericScans/Scan.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan2.py b/script/GenericScans/Scan2.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan3.py b/script/GenericScans/Scan3.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan4.py b/script/GenericScans/Scan4.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan5.py b/script/GenericScans/Scan5.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan6.py b/script/GenericScans/Scan6.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan7.py b/script/GenericScans/Scan7.py old mode 100644 new mode 100755 diff --git a/script/GenericScans/Scan8.py b/script/GenericScans/Scan8.py old mode 100644 new mode 100755 diff --git a/script/PBPGXscan b/script/PBPGXscan old mode 100644 new mode 100755 diff --git a/script/PEPG scans/X-scan.scan b/script/PEPG scans/X-scan.scan old mode 100644 new mode 100755 index 1a040e8..a045ae2 --- a/script/PEPG scans/X-scan.scan +++ b/script/PEPG scans/X-scan.scan @@ -1 +1 @@ -[ "Linear", [ [ "Channel", "SATFE10-PEPG046:MOTOR_X.VAL", -1.0, 1.0, 0.1 ] ], [ [ "Channel", "SATFE10-PEPG046-DS1:READ.VAL", 10, 0, "Enabled" ], [ "Channel", "SATFE10-PEPG046-DS2:READ.VAL", 10, 0, "Enabled" ] ], false, [ ], "PEPG X-position scan", 1, 1.0, 20.0, false, false, true, true, "", "", " ", "", 0, null, null, "Positioner", false, true ] \ No newline at end of file +[ "Linear", [ [ "Channel", "SATFE10-PEPG046:MOTOR_X.VAL", -1.0, 1.0, 0.1 ] ], [ [ "Channel", "SATFE10-LSCP1-FNS:CH2:BOXCAR.VALG", 100, 0, "Enabled" ], [ "Channel", "SATFE10-LSCP1-FNS:CH3:BOXCAR.VALG", 100, 0, "Enabled" ] ], false, [ ], "PEPG X-position scan", 1, 1.0, 5.0, false, false, true, true, "X_scan_1", "", "Default", "", 0, null, null, "Positioner", false, true ] \ No newline at end of file diff --git a/script/PEPG scans/X-scan_slow.scan b/script/PEPG scans/X-scan_slow.scan new file mode 100644 index 0000000..a6685eb --- /dev/null +++ b/script/PEPG scans/X-scan_slow.scan @@ -0,0 +1 @@ +[ "Linear", [ [ "Channel", "SATFE10-PEPG046:MOTOR_X.VAL", -1.0, 1.0, 0.1 ] ], [ [ "Channel", "SATFE10-PEPG046-DS1:READ.VAL", 10, 0, "Enabled" ], [ "Channel", "SATFE10-PEPG046-DS2:READ.VAL", 100, 0, "Enabled" ] ], false, [ ], "PEPG X-position scan", 1, 1.0, 10.0, false, false, true, true, "X_scan_slow", "", "Default", "", 0, null, null, "Positioner", false, true ] \ No newline at end of file diff --git a/script/PEPG scans/Y-scan.scan b/script/PEPG scans/Y-scan.scan old mode 100644 new mode 100755 index ca9f1c9..ff31ea1 --- a/script/PEPG scans/Y-scan.scan +++ b/script/PEPG scans/Y-scan.scan @@ -1 +1 @@ -[ "Linear", [ [ "Channel", "SATFE10-PEPG046:MOTOR_Y.VAL", -1.0, 1.0, 0.1 ] ], [ [ "Channel", "SATFE10-PEPG046-US1:READ.VAL", 10, 0, "Enabled" ], [ "Channel", "SATFE10-PEPG046-US2:READ.VAL", 10, 0, "Enabled" ] ], false, [ ], "PEPG Y-position scan", 1, 1.0, 20.0, false, false, true, true, "", "", " ", "", 0, null, null, "Positioner", false, true ] \ No newline at end of file +[ "Linear", [ [ "Channel", "SATFE10-PEPG046:MOTOR_Y.VAL", -1.0, 1.0, 0.1 ] ], [ [ "Channel", "SATFE10-LSCP1-FNS:CH0:BOXCAR.VALG", 100, 0, "Enabled" ], [ "Channel", "SATFE10-LSCP1-FNS:CH1:BOXCAR.VALG", 100, 0, "Enabled" ] ], false, [ ], "PEPG Y-position scan", 1, 1.0, 5.0, false, false, true, true, "Y_scan_HVhigh", "", "", "", 0, null, null, "Positioner", false, true ] \ No newline at end of file diff --git a/script/Photonics/KValueScan.py b/script/Photonics/KValueScan.py old mode 100644 new mode 100755 diff --git a/script/Photonics/KValueScanGas.py b/script/Photonics/KValueScanGas.py old mode 100644 new mode 100755 diff --git a/script/Photonics/PbpgPosScan.py b/script/Photonics/PbpgPosScan.py old mode 100644 new mode 100755 diff --git a/script/Photonics/PhaseShifterScan.py b/script/Photonics/PhaseShifterScan.py old mode 100644 new mode 100755 diff --git a/script/Photonics/PhaseShifterScanGas.py b/script/Photonics/PhaseShifterScanGas.py old mode 100644 new mode 100755 diff --git a/script/Photonics/PhaseShifterScan_DV.py b/script/Photonics/PhaseShifterScan_DV.py old mode 100644 new mode 100755 diff --git a/script/RFscan/GunEnergyScan.py b/script/RFscan/GunEnergyScan.py old mode 100644 new mode 100755 diff --git a/script/RFscan/GunEnergyScanLasSet.py b/script/RFscan/GunEnergyScanLasSet.py old mode 100644 new mode 100755 diff --git a/script/RFscan/GunEnergyScanRfSet.py b/script/RFscan/GunEnergyScanRfSet.py old mode 100644 new mode 100755 diff --git a/script/RFscan/RfEnergyCalib.py b/script/RFscan/RfEnergyCalib.py old mode 100644 new mode 100755 index 3111df7..9f96b6c --- a/script/RFscan/RfEnergyCalib.py +++ b/script/RFscan/RfEnergyCalib.py @@ -1,46 +1,20 @@ -E1 = 2428.0 # old energy gain -E2 = 2357.0 # new energy gain +station = "S10CB09" +dE = 233.5# MeV -do_elog = True +A1 = caget(station + "-RSYS:SET-VSUM-AMPLT-SCALE") # MV/unit +P1 = caget(station + "-RSYS:SET-VOLT-POWER-SCALE") # MW/MV^2 +VSA = caget(station + "-RSYS:GET-VSUM-AMPLT") # unit +PWR = caget(station + "-RSYS:GET-KLY-POWER-GATED") # MW +ACC1 = caget(station + "-RSYS:SET-ACC-VOLT") # MV -#stationlist = ("SINSB01","SINSB02","SINSB03","SINSB04","SINXB01") -#stationlist = ("S10CB01","S10CB02","S10CB03","S10CB04","S10CB05","S10CB06","S10CB07","S10CB08","S10CB09") -#stationlist = ("S20CB01","S20CB02","S20CB03","S20CB04") -stationlist = ("S30CB01","S30CB02","S30CB03","S30CB04","S30CB05","S30CB06","S30CB07","S30CB08","S30CB09","S30CB10","S30CB11","S30CB12","S30CB13") +A2 = dE / VSA +P2 = PWR / dE**2 +ACC2 = ACC1 * A2 / A1 -# set RF on-delay -caput("SIN-TIMAST-TMA:Beam-RF-OnDelay-Sel", 1) -caput("SIN-TIMAST-TMA:Beam-Apply-Cmd.PROC", 1) +caput(station + "-RSYS:SET-VSUM-AMPLT-SCALE", A2) +caput(station + "-RSYS:SET-VOLT-POWER-SCALE", P2) +time.sleep(2.0) +caput(station + "-RSYS:SET-ACC-VOLT", ACC2) +print(A2,P2,ACC2) -# energy calibration -A1, A2 = {}, {} -P1, P2 = {}, {} -new_acc_volt = {} -for station in stationlist: - A = caget(station + "-RSYS:SET-VSUM-AMPLT-SCALE") # MV/unit - P = caget(station + "-RSYS:SET-VOLT-POWER-SCALE") # MW/MV^2 - vsum_ampl = caget(station + "-RSYS:GET-VSUM-AMPLT") # unit - A1[station] = A - A2[station] = A * E2 / E1 - P1[station] = P - P2[station] = P * (E1 / E2)**2 - new_acc_volt[station] = vsum_ampl * A2[station] -for station in stationlist: - caput(station + "-RSYS:SET-VSUM-AMPLT-SCALE", A2[station]) - caput(station + "-RSYS:SET-VOLT-POWER-SCALE", P2[station]) - caput(station + "-RSYS:SET-ACC-VOLT", new_acc_volt[station]) - -# set RF on-beam -caput("SIN-TIMAST-TMA:Beam-RF-OnDelay-Sel", 0) -caput("SIN-TIMAST-TMA:Beam-Apply-Cmd.PROC", 1) - -#Elog entry -if do_elog: - title = "Energy calibration scaling" - log_msg = "Old energy gain: %0.2f" % E1 + " MeV/c\n" - log_msg = log_msg + "New energy gain: %0.2f" % E2 + " MeV/c\n\n" - log_msg = log_msg + " A1 A2 P1 P2 \n" - for station in stationlist: - log_msg = log_msg + station + "%10.2f%10.2f%10.6f%10.6f" % (A1[station],A2[station],P1[station],P2[station]) + " \n" - attachments = None - elog(title, log_msg) +#caget S30CB01-RSYS:{SET-VSUM-AMPLT-SCALE,SET-VOLT-POWER-SCALE,GET-VSUM-AMPLT,GET-KLY-POWER-GATED,SET-ACC-VOLT} diff --git a/script/RFscan/RfEnergyCalibGlobal.py b/script/RFscan/RfEnergyCalibGlobal.py new file mode 100755 index 0000000..dcb0bf7 --- /dev/null +++ b/script/RFscan/RfEnergyCalibGlobal.py @@ -0,0 +1,47 @@ +E1 = 1962.0 # old energy gain +E2 = 1950.0 # new energy gain + +do_elog = True + +#stationlist = ("SINSB01","SINSB02","SINSB03","SINSB04","SINXB01") +#stationlist = ("S10CB01","S10CB02","S10CB03","S10CB04","S10CB05","S10CB06","S10CB07","S10CB08","S10CB09") +#stationlist = ("S20CB01","S20CB02","S20CB03","S20CB04") +#stationlist = ("S30CB01","S30CB02","S30CB03","S30CB04","S30CB05","S30CB06","S30CB07","S30CB08","S30CB09","S30CB10","S30CB11","S30CB12","S30CB13") +stationlist = ("S10CB01","S10CB02","S10CB03","S10CB04","S10CB05","S10CB06","S10CB07","S10CB08","S10CB09") + +# set RF on-delay +caput("SIN-TIMAST-TMA:Beam-RF-OnDelay-Sel", 1) +caput("SIN-TIMAST-TMA:Beam-Apply-Cmd.PROC", 1) + +# energy calibration +A1, A2 = {}, {} +P1, P2 = {}, {} +new_acc_volt = {} +for station in stationlist: + A = caget(station + "-RSYS:SET-VSUM-AMPLT-SCALE") # MV/unit + P = caget(station + "-RSYS:SET-VOLT-POWER-SCALE") # MW/MV^2 + vsum_ampl = caget(station + "-RSYS:GET-VSUM-AMPLT") # unit + A1[station] = A + A2[station] = A * E2 / E1 + P1[station] = P + P2[station] = P * (E1 / E2)**2 + new_acc_volt[station] = vsum_ampl * A2[station] +for station in stationlist: + caput(station + "-RSYS:SET-VSUM-AMPLT-SCALE", A2[station]) + caput(station + "-RSYS:SET-VOLT-POWER-SCALE", P2[station]) + caput(station + "-RSYS:SET-ACC-VOLT", new_acc_volt[station]) + +# set RF on-beam +caput("SIN-TIMAST-TMA:Beam-RF-OnDelay-Sel", 0) +caput("SIN-TIMAST-TMA:Beam-Apply-Cmd.PROC", 1) + +#Elog entry +if do_elog: + title = "Energy calibration scaling" + log_msg = "Old energy gain: %0.2f" % E1 + " MeV/c\n" + log_msg = log_msg + "New energy gain: %0.2f" % E2 + " MeV/c\n\n" + log_msg = log_msg + " A1 A2 P1 P2 \n" + for station in stationlist: + log_msg = log_msg + station + "%10.2f%10.2f%10.6f%10.6f" % (A1[station],A2[station],P1[station],P2[station]) + " \n" + attachments = None + elog(title, log_msg) diff --git a/script/RFscan/SchottkyScan.py b/script/RFscan/SchottkyScan.py old mode 100644 new mode 100755 diff --git a/script/RFscan/phase_scan_caqtdm.py b/script/RFscan/phase_scan_caqtdm.py old mode 100644 new mode 100755 index c52ab15..5066fe4 --- a/script/RFscan/phase_scan_caqtdm.py +++ b/script/RFscan/phase_scan_caqtdm.py @@ -7,11 +7,15 @@ do_elog = True is_panel = get_exec_pars().source != CommandSource.ui if is_panel: - station = args[0] - bpm_ch = args[1] + station = args[0] + bpm_ch = args[1] + bpm_field = args[2] else: + #station = "SATCB01" + #bpm_ch = "SATBD02-DBPM010" station = "STEST01" bpm_ch = "SINBC02-DBPM140" + bpm_field = "X1" start = caget(station + "-RSYS:SET-SCAN-START") stop = caget(station + "-RSYS:SET-SCAN-STOP") step = caget(station + "-RSYS:SET-SCAN-STEP") @@ -31,7 +35,8 @@ def mbnd(bpm_ch): 'SARCL02-DBPM220': 'SARCL02-MBND100', 'SARCL02-DBPM260': 'SARCL02-MBND100', 'SARCL02-DBPM330': 'SARCL02-MBND100', - 'SARCL02-DBPM470': 'SARCL02-MBND100' + 'SARCL02-DBPM470': 'SARCL02-MBND100', + 'SATBD02-DBPM010': 'SATBD01-MBND200' }[bpm_ch] p0 = caget(mbnd(bpm_ch) + ":P-READ") energy0 = p0 - 0.511 @@ -51,7 +56,7 @@ P.initialize() if dry_run: x = ChannelDouble("BPM-X averager", bpm_ch + ":X1-SIMU") else: - x = ChannelDouble("BPM-X averager", bpm_ch + ":X1") + x = ChannelDouble("BPM-X averager", bpm_ch + ":" + bpm_field) x.initialize() phase0 = phase.read() % 360.0 caput(station + "-RSYS:GET-FIT-PHASE-ARRAY", to_array([0.0],'d')) diff --git a/script/RFscan/phase_scan_caqtdm_set.py b/script/RFscan/phase_scan_caqtdm_set.py old mode 100644 new mode 100755 diff --git a/script/RFscan/setRFphaseGlobal.py b/script/RFscan/setRFphaseGlobal.py old mode 100644 new mode 100755 diff --git a/script/RFscan/setRFscanRange.py b/script/RFscan/setRFscanRange.py old mode 100644 new mode 100755 index 225aec4..353a498 --- a/script/RFscan/setRFscanRange.py +++ b/script/RFscan/setRFscanRange.py @@ -1,11 +1,11 @@ -scan_range = 100.0 +scan_range = 80.0 nb_steps = 21 -stationlist = ("SINSB01","SINSB02","SINSB03","SINSB04","SINXB01") +#stationlist = ("SINSB01","SINSB02","SINSB03","SINSB04","SINXB01") #stationlist = ("S10CB01","S10CB02","S10CB03","S10CB04","S10CB05","S10CB06","S10CB07","S10CB08","S10CB09") #stationlist = ("S20CB01","S20CB02","S20CB03","S20CB04") -#stationlist = ("S20CB01","S20CB02","S20CB03","S20CB04","S30CB01","S30CB02","S30CB03","S30CB04","S30CB05","S30CB06","S30CB07","S30CB08","S30CB09","S30CB10","S30CB11","S30CB12","S30CB13") +stationlist = ("S20CB01","S20CB02","S20CB03","S20CB04","S30CB01","S30CB02","S30CB03","S30CB04","S30CB05","S30CB06","S30CB07","S30CB08","S30CB09","S30CB10","S30CB11","S30CB12","S30CB13") P1, P2 = {}, {} for station in stationlist: diff --git a/script/Tools/CameraTools.py b/script/Tools/CameraTools.py old mode 100644 new mode 100755 diff --git a/script/Tools/inventory.py b/script/Tools/inventory.py old mode 100644 new mode 100755 diff --git a/script/Tools/save_camera_data.py b/script/Tools/save_camera_data.py old mode 100644 new mode 100755 diff --git a/script/Tools/save_camera_data_client.py b/script/Tools/save_camera_data_client.py old mode 100644 new mode 100755 diff --git a/script/Tools/save_snapshot.py b/script/Tools/save_snapshot.py old mode 100644 new mode 100755 diff --git a/script/Tools/save_snapshot_client.py b/script/Tools/save_snapshot_client.py old mode 100644 new mode 100755 diff --git a/script/Undulators/1DscanEarthField.py b/script/Undulators/1DscanEarthField.py old mode 100644 new mode 100755 diff --git a/script/Undulators/1DscanEarthField2.py b/script/Undulators/1DscanEarthField2.py old mode 100644 new mode 100755 diff --git a/script/Undulators/1DscanHeight.py b/script/Undulators/1DscanHeight.py old mode 100644 new mode 100755 diff --git a/script/Undulators/1DscanKvalue.py b/script/Undulators/1DscanKvalue.py old mode 100644 new mode 100755 diff --git a/script/Undulators/1DscanPhaseShifter.py b/script/Undulators/1DscanPhaseShifter.py old mode 100644 new mode 100755 diff --git a/script/Undulators/1DscanXpos.py b/script/Undulators/1DscanXpos.py old mode 100644 new mode 100755 diff --git a/script/Undulators/1DscanYpos.py b/script/Undulators/1DscanYpos.py old mode 100644 new mode 100755 diff --git a/script/Undulators/K-calc_AR.py b/script/Undulators/K-calc_AR.py old mode 100644 new mode 100755 index aef01f8..a18b5c0 --- a/script/Undulators/K-calc_AR.py +++ b/script/Undulators/K-calc_AR.py @@ -1,5 +1,5 @@ -Eph1 = 9.8 # actual photon energy -Eph2 = 8.4 # desired photon energy +Eph1 = 2.525 # actual photon energy in keV. Don't forget .0 at the end!! +Eph2 = 2.425 # desired photon energy in keV. Don't forget .0 at the end!! do_elog = True diff --git a/script/Undulators/K-calc_AT.py b/script/Undulators/K-calc_AT.py old mode 100644 new mode 100755 index 30da1bc..4702de2 --- a/script/Undulators/K-calc_AT.py +++ b/script/Undulators/K-calc_AT.py @@ -1,9 +1,9 @@ -Eph1 = 1095.0 # actual photon energy. Don't forget .0 at the end!! -Eph2 = 350.0 # desired photon energy. Don't forget .0 at the end!! +Eph1 = 0.720 # actual photon energy in keV. Don't forget .0 at the end!! +Eph2 = 0.710 # desired photon energy in keV. Don't forget .0 at the end!! -do_elog = True +do_elog = False -undlist = ("SATUN08","SATUN09","SATUN10","SATUN11","SATUN12","SATUN13","SATUN15","SATUN16","SATUN17","SATUN18","SATUN19","SATUN20","SATUN21","SATUN22") +undlist = ("SATUN06", "SATUN07", "SATUN08","SATUN09","SATUN10","SATUN11","SATUN12","SATUN13","SATUN15","SATUN16","SATUN17","SATUN18","SATUN19","SATUN20","SATUN21","SATUN22") K1, K2 = {}, {} for und in undlist: @@ -18,5 +18,4 @@ if do_elog: title = "Wavelength change" log_msg = "Old photon energy: %0.2f" % Eph1 + " kev\n" log_msg = log_msg + "New photon energy: %0.2f" % Eph2 + " keV\n" - elog(title, log_msg) - \ No newline at end of file + elog(title, log_msg) \ No newline at end of file diff --git a/script/Undulators/K_AR_scale.py b/script/Undulators/K_AR_scale.py new file mode 100755 index 0000000..5cfe2bc --- /dev/null +++ b/script/Undulators/K_AR_scale.py @@ -0,0 +1,24 @@ +dEph = caget("SARUN:USER-DELTA") +Eph1 = caget("SARUN:FELPHOTENE") + +Eph2 = Eph1 + dEph + +do_elog = True + +undlist = ("SARUN03","SARUN04","SARUN05","SARUN06","SARUN07","SARUN08","SARUN09","SARUN10","SARUN11","SARUN12","SARUN13","SARUN14","SARUN15") + +K1, K2 = {}, {} +for und in undlist: + K = caget(und + "-UIND030:K_SET") + K1[und] = K + K2[und] = ((Eph1 / Eph2 * (K**2 + 2) - 2))**0.5 +print K1,K2 +for und in undlist: caputq(und + "-UIND030:K_SET", K2[und]) + +#Elog entry +if do_elog: + title = "Wavelength change" + log_msg = "Old photon energy: %0.2f" % Eph1 + " kev\n" + log_msg = log_msg + "New photon energy: %0.2f" % Eph2 + " keV\n" + elog(title, log_msg) + \ No newline at end of file diff --git a/script/Undulators/K_AT_scale.py b/script/Undulators/K_AT_scale.py new file mode 100644 index 0000000..ad51dc5 --- /dev/null +++ b/script/Undulators/K_AT_scale.py @@ -0,0 +1,43 @@ +dEph = caget("SATUN:USER-DELTA") +Eph1 = caget("SATUN13-UIND030:FELPHOTENE") + +Eph2 = Eph1 + dEph + +do_elog = True + +undlist = ("SATUN06", "SATUN07", "SATUN08","SATUN09","SATUN10","SATUN11","SATUN12","SATUN13","SATUN15","SATUN16","SATUN17","SATUN18","SATUN19","SATUN20","SATUN21","SATUN22") + +K1, K2 = {}, {} +for und in undlist: + K = caget(und + "-UIND030:K_SET") + K1[und] = K + K2[und] = ((Eph1 / Eph2 * (K**2 + 2) - 2))**0.5 +print K1,K2 + +onPVlist, goPVlist = [], [] +for und in undlist: + caputq(und + "-UIND030:K_SET", K2[und]) + onPVlist.append(und + '-UIND030:RADIAL-ON.PROC') + goPVlist.append(und + '-UIND030:RADIAL-GO.PROC') + +time.sleep(0.5) +#Switching on radial motors (and pushing go) to ensure proper movements +for onPV in onPVlist: caput(onPV, 1) +time.sleep(0.5) +for goPV in goPVlist: caput(goPV, 1) + +#Elog entry +if do_elog: + title = "Wavelength change" + log_msg = "Old photon energy: %0.2f" % Eph1 + " kev\n" + log_msg = log_msg + "New photon energy: %0.2f" % Eph2 + " keV\n" + elog(title, log_msg) + +#Setting the gas detector photon energy +caputq("SATFE10-PEPG046:ENERGY", Eph2) +#Run Eugenio's phase-shifter/CHIC calculation +time.sleep(5.0) +caputq("SATUN-CHIC:PHOTON-ENERGY", Eph2) +time.sleep(0.2) +caputq("SATUN-CHIC:APPLY-DELAY-OFFSET-PHASE", 1) + \ No newline at end of file diff --git a/script/Undulators/K_AT_scale_DV.py b/script/Undulators/K_AT_scale_DV.py new file mode 100755 index 0000000..5e7a2cd --- /dev/null +++ b/script/Undulators/K_AT_scale_DV.py @@ -0,0 +1,33 @@ +dEph = caget("SATUN:USER-DELTA") +Eph1 = caget("SATUN:FELPHOTENE") + +Eph2 = Eph1 + dEph + +do_elog = True + +undlist = ("SATUN06", "SATUN07", "SATUN08","SATUN09","SATUN10","SATUN11","SATUN12","SATUN13","SATUN15","SATUN16","SATUN17","SATUN18","SATUN19","SATUN20","SATUN21","SATUN22") + +K1, K2 = {}, {} +for und in undlist: + K = caget(und + "-UIND030:K_SET") + K1[und] = K + K2[und] = ((Eph1 / Eph2 * (K**2 + 2) - 2))**0.5 +print K1,K2 +for und in undlist: caputq(und + "-UIND030:K_SET", K2[und]) +time.sleep(0.5) # Make sure the new K values have been written + +#Switching on radial motors (and pushing go) to ensure proper movements +for und in undlist: caput(und + "-UIND030:RADIAL-ON.PROC", 1) +for und in undlist: caput(und + "-UIND030:RADIAL-GO.PROC", 1) +time.sleep(5.0) # Make sure the undulators finished moving + +#Run Eugenio's phase-shifter/CHIC calculation +caput("SATUN-CHIC:PHOTON-ENERGY", Eph2) +caput("SATUN-CHIC:APPLY-DELAY-OFFSET-PHASE", 1) + +#Elog entry +if do_elog: + title = "Wavelength change" + log_msg = "Old photon energy: %0.2f" % Eph1 + " kev\n" + log_msg = log_msg + "New photon energy: %0.2f" % Eph2 + " keV\n" + elog(title, log_msg) diff --git a/script/local.groovy b/script/local.groovy old mode 100644 new mode 100755 diff --git a/script/local.js b/script/local.js old mode 100644 new mode 100755 diff --git a/script/test/181219_BPM_screen_correlation.py b/script/test/181219_BPM_screen_correlation.py old mode 100644 new mode 100755 diff --git a/script/test/181219_BPM_screen_correlation2.py b/script/test/181219_BPM_screen_correlation2.py old mode 100644 new mode 100755 diff --git a/script/test/181219_BPM_screen_correlation3.py b/script/test/181219_BPM_screen_correlation3.py old mode 100644 new mode 100755 diff --git a/script/test/190328_MKstability.py b/script/test/190328_MKstability.py old mode 100644 new mode 100755 diff --git a/script/test/BLM_raw_signal_plot.py b/script/test/BLM_raw_signal_plot.py old mode 100644 new mode 100755 diff --git a/script/test/CamtoolCheckPort.py b/script/test/CamtoolCheckPort.py old mode 100644 new mode 100755 diff --git a/script/test/CheckWireScans.py b/script/test/CheckWireScans.py old mode 100644 new mode 100755 diff --git a/script/test/CompressionBug.py b/script/test/CompressionBug.py old mode 100644 new mode 100755 diff --git a/script/test/DataLink.py b/script/test/DataLink.py old mode 100644 new mode 100755 diff --git a/script/test/ICT_timing.py b/script/test/ICT_timing.py old mode 100644 new mode 100755 diff --git a/script/test/MHprint.py b/script/test/MHprint.py old mode 100644 new mode 100755 diff --git a/script/test/MultiplePlot.py b/script/test/MultiplePlot.py old mode 100644 new mode 100755 diff --git a/script/test/MultipleTestAlignmentScan.py b/script/test/MultipleTestAlignmentScan.py old mode 100644 new mode 100755 diff --git a/script/test/PBPGMonitor.py b/script/test/PBPGMonitor.py old mode 100644 new mode 100755 diff --git a/script/test/PBPGMonitor_dv.py b/script/test/PBPGMonitor_dv.py old mode 100644 new mode 100755 diff --git a/script/test/PhaseShifterScan_dv.py b/script/test/PhaseShifterScan_dv.py old mode 100644 new mode 100755 diff --git a/script/test/PolyFitWithWeight.py b/script/test/PolyFitWithWeight.py old mode 100644 new mode 100755 diff --git a/script/test/PseudoDeviceTrigger.py b/script/test/PseudoDeviceTrigger.py old mode 100644 new mode 100755 diff --git a/script/test/QuadFit.py b/script/test/QuadFit.py old mode 100644 new mode 100755 diff --git a/script/test/ReturnBug.py b/script/test/ReturnBug.py old mode 100644 new mode 100755 diff --git a/script/test/SaveCamera.py b/script/test/SaveCamera.py old mode 100644 new mode 100755 diff --git a/script/test/SchottkyScan.py b/script/test/SchottkyScan.py old mode 100644 new mode 100755 diff --git a/script/test/SchottkyScanSet_dv.py b/script/test/SchottkyScanSet_dv.py old mode 100644 new mode 100755 diff --git a/script/test/SchottkyScan_dv.py b/script/test/SchottkyScan_dv.py old mode 100644 new mode 100755 diff --git a/script/test/Test2D.py b/script/test/Test2D.py old mode 100644 new mode 100755 diff --git a/script/test/Test2DScan.scan b/script/test/Test2DScan.scan old mode 100644 new mode 100755 diff --git a/script/test/Test2DScan2.scan b/script/test/Test2DScan2.scan old mode 100644 new mode 100755 diff --git a/script/test/TestAlignmentScan.py b/script/test/TestAlignmentScan.py old mode 100644 new mode 100755 diff --git a/script/test/TestCPython.py b/script/test/TestCPython.py old mode 100644 new mode 100755 diff --git a/script/test/TestCamtoolClient.py b/script/test/TestCamtoolClient.py old mode 100644 new mode 100755 diff --git a/script/test/TestCamtoolStreamIds.py b/script/test/TestCamtoolStreamIds.py old mode 100644 new mode 100755 diff --git a/script/test/TestChangeEvScan.scan b/script/test/TestChangeEvScan.scan old mode 100644 new mode 100755 diff --git a/script/test/TestCreateDeviceCam.py b/script/test/TestCreateDeviceCam.py old mode 100644 new mode 100755 diff --git a/script/test/TestDisp.py b/script/test/TestDisp.py old mode 100644 new mode 100755 diff --git a/script/test/TestGaussFitOffset.py b/script/test/TestGaussFitOffset.py old mode 100644 new mode 100755 diff --git a/script/test/TestHarmonicFitOffset.py b/script/test/TestHarmonicFitOffset.py old mode 100644 new mode 100755 diff --git a/script/test/TestMetadataArray.py b/script/test/TestMetadataArray.py old mode 100644 new mode 100755 diff --git a/script/test/TestMonitScan.scan b/script/test/TestMonitScan.scan old mode 100644 new mode 100755 diff --git a/script/test/TestMonitScan2.scan b/script/test/TestMonitScan2.scan old mode 100644 new mode 100755 diff --git a/script/test/TestMscan.py b/script/test/TestMscan.py old mode 100644 new mode 100755 diff --git a/script/test/TestPsen.py b/script/test/TestPsen.py old mode 100644 new mode 100755 diff --git a/script/test/TestSeverity.py b/script/test/TestSeverity.py old mode 100644 new mode 100755 diff --git a/script/test/TestSigProcess.py b/script/test/TestSigProcess.py old mode 100644 new mode 100755 diff --git a/script/test/TestSnapshot.py b/script/test/TestSnapshot.py old mode 100644 new mode 100755 diff --git a/script/test/TestStream.py b/script/test/TestStream.py new file mode 100755 index 0000000..0ce6a99 --- /dev/null +++ b/script/test/TestStream.py @@ -0,0 +1,46 @@ +import ch.psi.pshell.bs.DispatcherConfig.Incomplete as Incomplete +channels = ["SAROP11-PBPS117:INTENSITY", \ +"SAROP11-PBPS117:XPOS", \ +"SAROP11-PBPS117:YPOS", \ +"SLG-LSCP2-FNS:CH0:VAL_GET", \ +"SINEG01-DBPM340:Q1", \ +"SINEG01-DBPM340:X1", \ +"SINEG01-DBPM340:Y1", \ +"SINEG01-DBPM340:Q2", \ +"S20SY02-DBPM150:Q1", \ +"SINEG01-DBPM340:X2", \ +"SINEG01-DBPM340:Y2", \ +"SLG-LSCP2-FNS:CH0:VAL_GET"] + + +channels = [ \ + "S20SY02-DBPM150:Q1", \ + "SINEG01-DBPM340:X2", \ + "SLG-LSCP2-FNS:CH0:VAL_GET" \ + ] + +#channels = ["SLG-LSCP2-FNS:CH0:VAL_GET"] + +#dispatcher.config.mappingIncomplete=None +#dispatcher.config.mappingIncomplete = Incomplete.fill_null +dispatcher.config.mappingIncomplete = Incomplete.provide_as_is +#dispatcher.config.mappingIncomplete = Incomplete.drop +s1 = Stream("s1", dispatcher) +#s1.initialize() +s1.setIncomplete("fill_null") +for c in channels: + s1.addScalar(c,c, 1, 0) +s1.addScalar("SAROP11-PBPS117:INTENSITY","SAROP11-PBPS117:INTENSITY", 10, 0) + +add_device(s1, True) + +s1.start() +s1.waitCacheChange(5000) +print s1.take().keys() +for i in range(20): + #print s1.take().keys(), s1.take().values() + print s1.take().values() + s1.waitCacheChange(5000) + + +#ret = bscan (s1, 20, None, save=False) \ No newline at end of file diff --git a/script/test/TestTimestamp.py b/script/test/TestTimestamp.py old mode 100644 new mode 100755 diff --git a/script/test/TestWS.py b/script/test/TestWS.py old mode 100644 new mode 100755 diff --git a/script/test/TestWaveformListener.py b/script/test/TestWaveformListener.py old mode 100644 new mode 100755 diff --git a/script/test/TestWireScanChannels.py b/script/test/TestWireScanChannels.py old mode 100644 new mode 100755 diff --git a/script/test/TestyArrOp.py b/script/test/TestyArrOp.py old mode 100644 new mode 100755 diff --git a/script/test/WireScanEncoderTest.py b/script/test/WireScanEncoderTest.py old mode 100644 new mode 100755 diff --git a/script/test/WireScanMock.py b/script/test/WireScanMock.py old mode 100644 new mode 100755 diff --git a/script/test/WireScanTest.py b/script/test/WireScanTest.py old mode 100644 new mode 100755 index bf0b536..20989f4 --- a/script/test/WireScanTest.py +++ b/script/test/WireScanTest.py @@ -26,7 +26,7 @@ if prefix not in get_wire_scans(): scanner = WireScanner(prefix, sel, start, end, cycles, velocity, True) #Stream channels -bs_position = scanner.motor_bs_readback.getName() +bs_position = scanner.motor_bs_readback.get_channel_name() bpms = get_wire_scans_bpms(prefix) if bpms is None: raise Exception("Cannot determine wire scan bpms: " + prefix) diff --git a/script/test/WireScanTest2.py b/script/test/WireScanTest2.py old mode 100644 new mode 100755 diff --git a/script/test/WireScanTest3.py b/script/test/WireScanTest3.py old mode 100644 new mode 100755 index 4d21514..ab06200 --- a/script/test/WireScanTest3.py +++ b/script/test/WireScanTest3.py @@ -29,9 +29,9 @@ if prefix not in get_wire_scanners(): scanner = WireScanner(prefix, scan_range, cycles, velocity, True) #List of stream channels -channels = [("m_pos", scanner.motor_bs_readback.getName()), - ("cur_cycle", scanner.curr_cycl.getName()), - ("scanning", scanner.status_channels[0].getName())] +channels = [("m_pos", scanner.motor_bs_readback.get_channel_name()), + ("cur_cycle", scanner.curr_cycl.get_channel_name()), + ("scanning", scanner.status_channels[0].get_channel_name())] for i in range (len(blms)): channels.append (("blm" + str(i+1), blms[i] + ":B1_LOSS")) for i in range (len(bpms)): diff --git a/script/test/WireScannerChannels.py b/script/test/WireScannerChannels.py old mode 100644 new mode 100755 diff --git a/script/test/WireScannerOutputChannels.py b/script/test/WireScannerOutputChannels.py old mode 100644 new mode 100755 diff --git a/script/test/averager.py b/script/test/averager.py old mode 100644 new mode 100755 diff --git a/script/test/blm.py b/script/test/blm.py old mode 100644 new mode 100755 diff --git a/script/test/blm_gain_adjustment.py b/script/test/blm_gain_adjustment.py old mode 100644 new mode 100755 diff --git a/script/test/bs.py b/script/test/bs.py old mode 100644 new mode 100755 diff --git a/script/test/bs2.py b/script/test/bs2.py old mode 100644 new mode 100755 diff --git a/script/test/bs3.py b/script/test/bs3.py old mode 100644 new mode 100755 diff --git a/script/test/bs4.py b/script/test/bs4.py old mode 100644 new mode 100755 diff --git a/script/test/cpython.py b/script/test/cpython.py old mode 100644 new mode 100755 diff --git a/script/test/lin1 phase.py b/script/test/lin1 phase.py old mode 100644 new mode 100755 diff --git a/script/test/offset.py b/script/test/offset.py old mode 100644 new mode 100755 diff --git a/script/test/offset2.py b/script/test/offset2.py old mode 100644 new mode 100755 diff --git a/script/test/offset_1.py b/script/test/offset_1.py old mode 100644 new mode 100755 diff --git a/script/test/offset_K.py b/script/test/offset_K.py old mode 100644 new mode 100755 diff --git a/script/test/offset_linear.py b/script/test/offset_linear.py old mode 100644 new mode 100755 diff --git a/script/test/particle_analysis.py b/script/test/particle_analysis.py old mode 100644 new mode 100755 diff --git a/script/test/save_snapshot.py b/script/test/save_snapshot.py old mode 100644 new mode 100755 diff --git a/script/test/scale_ECOL_MCOR_MSEX.py b/script/test/scale_ECOL_MCOR_MSEX.py old mode 100644 new mode 100755 diff --git a/script/test/scan_example2_dv.py b/script/test/scan_example2_dv.py old mode 100644 new mode 100755 diff --git a/script/test/scan_example3_dv.py b/script/test/scan_example3_dv.py old mode 100644 new mode 100755 diff --git a/script/test/scan_example_dv.py b/script/test/scan_example_dv.py old mode 100644 new mode 100755 diff --git a/script/test/shit.py b/script/test/shit.py new file mode 100644 index 0000000..585645b --- /dev/null +++ b/script/test/shit.py @@ -0,0 +1,2 @@ +caput('SATUN11-UIND030:RADIAL-ON', 1) +caput('SATUN11-UIND030:RADIAL-GO', 1) \ No newline at end of file diff --git a/script/test/testSH84.py b/script/test/testSH84.py old mode 100644 new mode 100755 diff --git a/script/test/test_stream.py b/script/test/test_stream.py old mode 100644 new mode 100755 diff --git a/script/test/thomas.py b/script/test/thomas.py old mode 100644 new mode 100755 diff --git a/script/wliw_scan.scan b/script/wliw_scan.scan old mode 100644 new mode 100755