diff --git a/script/QuadScan/QuadScan.py b/script/QuadScan/QuadScan.py
new file mode 100644
index 0000000..e127ace
--- /dev/null
+++ b/script/QuadScan/QuadScan.py
@@ -0,0 +1,57 @@
+# 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 = Channel("SINEG01-MSOL130:I-READ")
+cam_x, cam_y = ...       # some camtool command / channel?
+bpm_x = Channel("SINEG01-DBPM340:X1")
+bpm_y = Channel("SINEG01-DBPM340:Y1")
+
+def CheckCurrent():
+    n = 1
+    while n > 0:
+        sleep(0.2)
+        n = caget("SINEG01-MSOL130:I-COMP")
+
+I1 = 20.0
+I2 = 150.0
+dI = 1.0
+
+# Switch off magnets
+caput("SINEG01-MCRX120:I-SET", 0.0)
+caput("SINEG01-MCRY120:I-SET", 0.0)
+caput("SINEG01-MQUA140:I-SET", 0.0)
+caput("SINEG01-MQUA150:I-SET", 0.0)
+caput("SINEG01-MCRX160:I-SET", 0.0)
+caput("SINEG01-MCRY160:I-SET", 0.0)
+caput("SINEG01-MCRX180:I-SET", 0.0)
+caput("SINEG01-MCRY180:I-SET", 0.0)
+
+# Disable laser delay
+caput("SIN-CVME-TIMAST-TMA:LaserDelayControl", 0)
+
+# Scan using the screen
+#r = lscan(I_set, [I, cam_x, cam_y], I1, I2, dI, passes = 2, zigzag = True, before_read = CheckCurrent)
+# Scan using the BPM
+r = lscan(I_set, [I, bpm_x, bpm_y], I1, I2, dI, passes = 2, zigzag = True, before_read = CheckCurrent)
+
+# 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())