diff --git a/script/Alignment/Gun_solenoid_alignment_dv_sim.py b/script/Alignment/Gun_solenoid_alignment_dv_sim.py
new file mode 100644
index 0000000..9389280
--- /dev/null
+++ b/script/Alignment/Gun_solenoid_alignment_dv_sim.py
@@ -0,0 +1,70 @@
+# 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")
+I_comp = Channel("SINEG01-MSOL130:I-COMP")
+# cam_x, cam_y = ...       # some camtool command / channel?
+bpm_x = ai1        # Channel("SINEG01-DBPM340:X1")
+bpm_y = ai2        # Channel("SINEG01-DBPM340:Y1")
+
+def ccr(channel):
+    n = 1
+    while n > 0:
+        sleep(0.2)
+        n = caget(channel)
+
+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" ]
+for m in mag:
+    channel = m + ":I-SET"
+    caput(channel, 0.0)
+for m in mag:
+    channel = m + ":I-COMP"
+    ccr(channel)
+
+# 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, passes = 2, zigzag = True, before_read = ccr(I_comp))
+
+# 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 = "CM")
+
+# save the entry in the logbook
+msg = str(r)
+msg = msg + "\nFile: " + get_context().path
+msg = msg + "\n\n" + r.print()
+elog("Gun solenoid current scan", msg , get_plot_snapshots())