diff --git a/script/Alignment/Gun_solenoid_alignment_dv_sim.py b/script/Alignment/Gun_solenoid_alignment_dv_sim.py index bdc36d4..fce8c7c 100644 --- a/script/Alignment/Gun_solenoid_alignment_dv_sim.py +++ b/script/Alignment/Gun_solenoid_alignment_dv_sim.py @@ -21,24 +21,12 @@ def ccr(mag): n = caget(mag + ":I-COMP") I1 = 2.0 -I2 = 15.0 +I2 = 5.0 dI = 0.5 # Switch off magnets mag = [ "SINEG01-MCRX120", - "SINEG01-MCRY120", - "SINEG01-MQUA140", - "SINEG01-MQUA150", - "SINEG01-MCRX160", - "SINEG01-MCRY160", - "SINEG01-MCRX180", - "SINEG01-MCRY180", - "SINEG01-MCRX200", - "SINEG01-MCRY200", - "SINEG01-MCRX220", - "SINEG01-MCRY220", - "SINEG01-MQUA310", - "SINEG01-MQUA320" ] + "SINEG01-MCRY120"] for m in mag: caput(m + ":I-SET", 0.0) for m in mag: @@ -50,7 +38,7 @@ for m in mag: # Scan using the screen #r = lscan(I_set, [I_read, cam_x, cam_y], I1, I2, dI, passes = 2, zigzag = True) # Scan using the BPM -r = lscan(I_set, [I_read, bpm_x, bpm_y], I1, I2, dI, 1.0, passes = 2, zigzag = True) +r = lscan(I_set, [I_read, bpm_x, bpm_y], I1, I2, dI, 1.0) # Enable laser delay #caput("SIN-CVME-TIMAST-TMA:LaserDelayControl", 1) @@ -58,6 +46,8 @@ r = lscan(I_set, [I_read, bpm_x, bpm_y], I1, I2, dI, 1.0, passes = 2, zigzag = T # take the result of the scan and do the plots centroid_x = r.getReadable(1) centroid_y = r.getReadable(2) +print(centroid_x) +print(centroid_y) plot(centroid_y, xdata=centroid_x, title = "Centroid excursion") # save the entry in the logbook