diff --git a/config/devices.properties b/config/devices.properties index e9dae38..f583ed0 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,4 +1,4 @@ -$gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true +gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSYS:GET-BEAM-PHASE|||true #SINSB01_phase=ch.psi.pshell.epics.Positioner|VA-SINSB01-RSYS100:SET-BEAM-PHASE VA-SINSB01-RSYS100:GET-BEAM-PHASE|||true #BC1_energy=ch.psi.pshell.epics.ChannelDouble|VA-SINBC02-DBPM140:ENERGY|Read||true diff --git a/script/Alignment/Gun_solenoid_alignment.py b/script/Alignment/Gun_solenoid_alignment.py index cb10355..db88f90 100755 --- a/script/Alignment/Gun_solenoid_alignment.py +++ b/script/Alignment/Gun_solenoid_alignment.py @@ -51,7 +51,7 @@ mag = [ "SINEG01-MCRX120","SINEG01-MCRY120", "SINEG01-MQUA310", "SINEG01-MQUA320" ] -switchOffMagnets(mag) +switch_off_magnets(mag) # add here gun phase setting see wiki page diff --git a/script/Alignment/Laser_gun_alignment.py b/script/Alignment/Laser_gun_alignment.py index 4c18161..fe2a069 100755 --- a/script/Alignment/Laser_gun_alignment.py +++ b/script/Alignment/Laser_gun_alignment.py @@ -42,7 +42,7 @@ mag = [ "SINEG01-MCRX120","SINEG01-MCRY120", "SINEG01-MQUA310", "SINEG01-MQUA320" ] if zero_solenoids: - switchOffMagnets(mag) + multiple_background(mag) # add here gun phase setting see wiki page diff --git a/script/local.groovy b/script/local.groovy deleted file mode 100755 index 6cd1527..0000000 --- a/script/local.groovy +++ /dev/null @@ -1,3 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Deployment specific global definitions - executed after startup.groovy -/////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/script/local.js b/script/local.js deleted file mode 100755 index 17db863..0000000 --- a/script/local.js +++ /dev/null @@ -1,4 +0,0 @@ -/////////////////////////////////////////////////////////////////////////////////////////////////// -// Deployment specific global definitions - executed after startup.js -/////////////////////////////////////////////////////////////////////////////////////////////////// - diff --git a/script/test1.py b/script/test1.py deleted file mode 100644 index 392790d..0000000 --- a/script/test1.py +++ /dev/null @@ -1,3 +0,0 @@ -print "Start" -time.sleep(3.0) -print "Stop" \ No newline at end of file