diff --git a/script/Alignment/Gun_solenoid_alignment_dv_sim.py b/script/Alignment/Gun_solenoid_alignment_dv_sim.py
index f299bf4..fe4961e 100644
--- a/script/Alignment/Gun_solenoid_alignment_dv_sim.py
+++ b/script/Alignment/Gun_solenoid_alignment_dv_sim.py
@@ -1,68 +1,34 @@
-# Tool to align the solenoid on the gun.
-# S. Bettoni, A. Gobbo, D. Voulot
-# 30/05/2016
-
-
-# Procedure:
-    # switch off all the magnets between the gun solenoid and the screen or BPM used for the measurement
-    # change the current of the gun soleoid
-    # look at the centroid position (BPM or screen) downstream of the gun.
-
 I_set = Channel("SINEG01-MSOL130:I-SET")
 I_read = Channel("SINEG01-MSOL130:I-READ")
-# cam_x, cam_y = ...       # some camtool command / channel?
 bpm_x = ai1        # Channel("SINEG01-DBPM340:X1")
 bpm_y = ai2        # Channel("SINEG01-DBPM340:Y1")
 
 def ccr(mag):
     n = 1
-    I_comp = Channel(mag + ":I-COMP")
     while n > 0:
         sleep(0.2)
-        n = I_comp
+        n = caget(Channel(mag + ":I-COMP"))
 
 I1 = 2.0
 I2 = 15.0
 dI = 1.0
 
-# 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-MQUA150"]
 for m in mag:
     ch = m + ":I-SET"
     caput(ch, 0.0)
 for m in mag:
     ccr(m)
 
-# Disable laser delay
-# caput("SIN-CVME-TIMAST-TMA:LaserDelayControl", 0)
-
-# Scan using the screen
-#r = lscan(I_set, [I_read, cam_x, cam_y], I1, I2, dI, passes = 2, zigzag = True, before_read = CheckCurrent)
-# Scan using the BPM
 r = lscan(I_set, [I_read, bpm_x, bpm_y], I1, I2, dI)
 
-# Enable laser delay
-# caput("SIN-CVME-TIMAST-TMA:LaserDelayControl", 1)
-
-# take the result of the scan and do the plots
 x = r.getReadable(1)
 y = r.getReadable(2)
 plot(y, xdata=x, title = "Centroid excursion")
 
-# save the entry in the logbook
 msg = str(r)
 msg = msg + "\nFile: " + get_context().path
 msg = msg + "\n\n" + r.print()