diff --git a/script/Alignment/Gun_solenoid_alignment_dv.py b/script/Alignment/Gun_solenoid_alignment_dv.py
new file mode 100644
index 0000000..ebd05af
--- /dev/null
+++ b/script/Alignment/Gun_solenoid_alignment_dv.py
@@ -0,0 +1,37 @@
+#Tool to align the laser on the cathode.
+# S. Bettoni, A. Gobbo, D. Voulot
+#10/05/2016
+
+
+#Procedure:
+    #I switch off all the magnets between the gun solenoid and the screen or BPM used for the measurement
+    #I change the current of the gun soleoid
+    #I look at the centroid position (BPM or screen) downstream of the gun.
+
+gun_sol_I = Channel("SINEG01-MSOL130:I-SET")
+center_x, center_y = ...       # some camtool command or channel?
+bpm_x = Channel("SINEG01-DBPM340:X1")
+bpm_y = Channel("SINEG01-DBPM340:Y1")
+
+start_I = 20
+end_I = 150
+step_I = 1
+
+# Enable gun laser
+caput("SIN-CVME-TIMAST-TMA:Beam-laser-On", 1)
+
+#Scan using the screen
+r = lscan(gun_sol_I, [center_x, center_y], start_I, end_I, step_I, latency = 0.5)
+#Scan using the BPM
+#r = lscan(gun_sol_current, [bpm_x, bpm_y], start_I, end_I, step_I, latency = 0.5)
+
+# Disable gun laser
+caput("SIN-CVME-TIMAST-TMA:Beam-laser-On", 0)
+
+#I take the result of the scan and I do the plots
+x = r.getReadable(0)
+y = r.getReadable(1)
+plot(y, xdata=x, title = "CM")
+
+#I save the entry in the logbook
+
diff --git a/script/local.py b/script/local.py
index 3750aac..e022b07 100755
--- a/script/local.py
+++ b/script/local.py
@@ -2,144 +2,148 @@
 #  Deployment specific global definitions - executed after startup.py
 ###################################################################################################
 
-from mathutils import estimate_peak_indexes, fit_gaussians, create_fit_point_list, Gaussian
-from mathutils import fit_polynomial,fit_gaussian, fit_harmonic, calculate_peaks
-from mathutils import PolynomialFunction, Gaussian, HarmonicOscillator
-
-import java.awt.Color as Color
- 
-
-def fit(ydata, xdata = None):
-    """
-    """
-    if xdata is None:
-        xdata = frange(0, len(ydata), 1)
-    max_y= max(ydata)   
-    index_max = ydata.index(max_y)   
-    max_x= xdata[index_max]
-    print "Max index:" + str(index_max),
-    print " x:" + str(max_x),
-    print " y:" + str(max_y)
-    gaussians = fit_gaussians(ydata, xdata, [index_max,])
-    (norm, mean, sigma) = gaussians[0]
-    p = plot([ydata],["data"],[xdata], title="Fit" )[0]
-    fitted_gaussian_function = Gaussian(norm, mean, sigma)   
-    scale_x = [float(min(xdata)), float(max(xdata)) ]
-    points = max((len(xdata)+1), 100)
-    resolution = (scale_x[1]-scale_x[0]) / points   
-    fit_y = []
-    fit_x = frange(scale_x[0],scale_x[1],resolution, True)
-    for x in fit_x:
-        fit_y.append(fitted_gaussian_function.value(x))   
-    p.addSeries(LinePlotSeries("fit"))
-    p.getSeries(1).setData(fit_x, fit_y)   
-    
-    if abs(mean - xdata[index_max]) < ((scale_x[0] + scale_x[1])/2):
-        print "Mean -> " +  str(mean)
-        p.addMarker(mean, None, "Mean="+str(round(norm,2)), Color.MAGENTA.darker())
-        return (norm, mean, sigma)
-    else:
-        p.addMarker(max_x, None, "Max="+str(round(max_x,2)), Color.GRAY)
-        print "Invalid gaussian fit: " +  str(mean)
-        return (None, None, None)
-
-
-def hfit(ydata, xdata = None):
-    if xdata is None:
-        xdata = frange(0, len(ydata), 1)
-
-    max_y= max(ydata)    
-    index_max = ydata.index(max_y)    
-    max_x= xdata[index_max]
-        
-    start,end = min(xdata), max(xdata)
-    (amplitude, angular_frequency, phase) = fit_harmonic(ydata, xdata)
-    fitted_harmonic_function = HarmonicOscillator(amplitude, angular_frequency, phase)
-    
-    print "amplitude = ", amplitude
-    print "angular frequency = ", angular_frequency
-    print "phase = ", phase
-
-    f = angular_frequency/ (2* math.pi)  
-    print "frequency = ", f  
-
-    resolution = 0.01
-    fit_y = []
-    for x in frange(start,end,resolution, True):
-        fit_y.append(fitted_harmonic_function.value(x))
-    fit_x = frange(start, end+resolution, resolution)
-
-    p = plot(ydata,"data", xdata, title="HFit")[0]
-    p.addSeries(LinePlotSeries("fit"))
-    p.getSeries(1).setData(fit_x, fit_y)    
-
-    #m = (phase + math.pi)/ angular_frequency
-    m = -phase / angular_frequency
-    if (m<start):
-        m+=(1.0/f)
-        
-    if start <=m <=end:
-        print "fit = ", m
-        p.addMarker(m, None, "Fit="+str(round(m ,2)), Color.MAGENTA.darker())
-        return (amplitude, angular_frequency, phase, True, m)
-    else:
-        print "max = ",max_x
-        p.addMarker(max_x, None, "Max="+str(round(max_x ,2)), Color.MAGENTA.darker())        
-        return (amplitude, angular_frequency, phase, False, max_x)
-        
-
-def elog(title, message, attachments = [], author = None, category = "Info", domain = "", logbook = "SwissFEL commissioning data", encoding=1):
-    """
-    Add entry to ELOG.
-    """
-    if author is None:
-        author = "pshell" #controller.getUser().name
-    typ = "pshell"
-    entry = ""
-   
-    cmd = 'G_CS_ELOG_add -l "' + logbook+ '" '
-    cmd = cmd + '-a "Author=' + author + '" '
-    cmd = cmd + '-a "Type=' + typ + '" '
-    cmd = cmd + '-a "Entry=' + entry + '" '
-    cmd = cmd + '-a "Title=' + title + '" '
-    cmd = cmd + '-a "Category=' + category + '" '
-    cmd = cmd + '-a "Domain=' + domain + '" '
-    for attachment in attachments:
-        cmd = cmd + '-f "' + attachment + '" '
-    cmd = cmd + '-n ' + str(encoding)
-    cmd = cmd + ' "' + message + '"'
-    #print cmd
-    #os.system (cmd)
-    #print os.popen(cmd).read()  
-    import subprocess
-    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
-    (out, err) = proc.communicate()
-    if (err is not None) and err!="":
-        raise Exception(err)
-    print out
-
-def get_plot_snapshots(title = None, file_type = "jpg", temp_path = controller.setup.getContextPath()):
-    """
-    Returns list with file names of plots snapshots from a plotting context.
-    """
-    sleep(0.02) #Give some time to plot to be finished - it is not sync  with acquisition
-    ret = []
-    for p in get_plots(title):        
-        file_name = os.path.abspath(temp_path + "/" + p.getTitle() + "." + file_type)
-        p.saveSnapshot(file_name , file_type)
-        ret.append(file_name)
-    return ret
-
-
-class Sinusoid(ReadonlyRegisterBase):
-    def doRead(self):               
-        self.x = self.x + 5.0 if hasattr(self, 'x') else 0.0
-        return math.sin(self.x * math.pi / 180.0) 
-
-add_device(Sinusoid("phase"), True)
-add_device(Sinusoid("bpm_q"), True)
-
-add_device(Sinusoid("center_x"), True)
-add_device(Sinusoid("center_y"), True)
-center_x.setPolling(100)                
-center_y.setPolling(100)                
\ No newline at end of file
+from mathutils import estimate_peak_indexes, fit_gaussians, create_fit_point_list, Gaussian
+from mathutils import fit_polynomial,fit_gaussian, fit_harmonic, calculate_peaks
+from mathutils import PolynomialFunction, Gaussian, HarmonicOscillator
+
+import java.awt.Color as Color
+
+
+def fit(ydata, xdata = None):
+    """
+    Gaussian fit
+    """
+    if xdata is None:
+        xdata = frange(0, len(ydata), 1)
+    max_y= max(ydata)
+    index_max = ydata.index(max_y)
+    max_x= xdata[index_max]
+    print "Max index:" + str(index_max),
+    print " x:" + str(max_x),
+    print " y:" + str(max_y)
+    gaussians = fit_gaussians(ydata, xdata, [index_max,])
+    (norm, mean, sigma) = gaussians[0]
+    p = plot([ydata],["data"],[xdata], title="Fit" )[0]
+    fitted_gaussian_function = Gaussian(norm, mean, sigma)
+    scale_x = [float(min(xdata)), float(max(xdata)) ]
+    points = max((len(xdata)+1), 100)
+    resolution = (scale_x[1]-scale_x[0]) / points
+    fit_y = []
+    fit_x = frange(scale_x[0],scale_x[1],resolution, True)
+    for x in fit_x:
+        fit_y.append(fitted_gaussian_function.value(x))
+    p.addSeries(LinePlotSeries("fit"))
+    p.getSeries(1).setData(fit_x, fit_y)
+
+    if abs(mean - xdata[index_max]) < ((scale_x[0] + scale_x[1])/2):
+        print "Mean -> " +  str(mean)
+        p.addMarker(mean, None, "Mean="+str(round(norm,2)), Color.MAGENTA.darker())
+        return (norm, mean, sigma)
+    else:
+        p.addMarker(max_x, None, "Max="+str(round(max_x,2)), Color.GRAY)
+        print "Invalid gaussian fit: " +  str(mean)
+        return (None, None, None)
+
+
+def hfit(ydata, xdata = None):
+    """
+    Harmonic fit
+    """
+    if xdata is None:
+        xdata = frange(0, len(ydata), 1)
+
+    max_y= max(ydata)
+    index_max = ydata.index(max_y)
+    max_x= xdata[index_max]
+
+    start,end = min(xdata), max(xdata)
+    (amplitude, angular_frequency, phase) = fit_harmonic(ydata, xdata)
+    fitted_harmonic_function = HarmonicOscillator(amplitude, angular_frequency, phase)
+
+    print "amplitude = ", amplitude
+    print "angular frequency = ", angular_frequency
+    print "phase = ", phase
+
+    f = angular_frequency/ (2* math.pi)
+    print "frequency = ", f
+
+    resolution = 0.01
+    fit_y = []
+    for x in frange(start,end,resolution, True):
+        fit_y.append(fitted_harmonic_function.value(x))
+    fit_x = frange(start, end+resolution, resolution)
+
+    p = plot(ydata,"data", xdata, title="HFit")[0]
+    p.addSeries(LinePlotSeries("fit"))
+    p.getSeries(1).setData(fit_x, fit_y)
+
+    #m = (phase + math.pi)/ angular_frequency
+    m = -phase / angular_frequency
+    if (m<start):
+        m+=(1.0/f)
+
+    if start <=m <=end:
+        print "fit = ", m
+        p.addMarker(m, None, "Fit="+str(round(m ,2)), Color.MAGENTA.darker())
+        return (amplitude, angular_frequency, phase, True, m)
+    else:
+        print "max = ",max_x
+        p.addMarker(max_x, None, "Max="+str(round(max_x ,2)), Color.MAGENTA.darker())
+        return (amplitude, angular_frequency, phase, False, max_x)
+
+
+def elog(title, message, attachments = [], author = None, category = "Info", domain = "", logbook = "SwissFEL commissioning data", encoding=1):
+    """
+    Add entry to ELOG.
+    """
+    if author is None:
+        author = "pshell" #controller.getUser().name
+    typ = "pshell"
+    entry = ""
+
+    cmd = 'G_CS_ELOG_add -l "' + logbook+ '" '
+    cmd = cmd + '-a "Author=' + author + '" '
+    cmd = cmd + '-a "Type=' + typ + '" '
+    cmd = cmd + '-a "Entry=' + entry + '" '
+    cmd = cmd + '-a "Title=' + title + '" '
+    cmd = cmd + '-a "Category=' + category + '" '
+    cmd = cmd + '-a "Domain=' + domain + '" '
+    for attachment in attachments:
+        cmd = cmd + '-f "' + attachment + '" '
+    cmd = cmd + '-n ' + str(encoding)
+    cmd = cmd + ' "' + message + '"'
+    #print cmd
+    #os.system (cmd)
+    #print os.popen(cmd).read()
+    import subprocess
+    proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
+    (out, err) = proc.communicate()
+    if (err is not None) and err!="":
+        raise Exception(err)
+    print out
+
+def get_plot_snapshots(title = None, file_type = "jpg", temp_path = controller.setup.getContextPath()):
+    """
+    Returns list with file names of plots snapshots from a plotting context.
+    """
+    sleep(0.02) #Give some time to plot to be finished - it is not sync  with acquisition
+    ret = []
+    for p in get_plots(title):
+        file_name = os.path.abspath(temp_path + "/" + p.getTitle() + "." + file_type)
+        p.saveSnapshot(file_name , file_type)
+        ret.append(file_name)
+    return ret
+
+
+class Sinusoid(ReadonlyRegisterBase):
+    def doRead(self):
+        self.x = self.x + 5.0 if hasattr(self, 'x') else 0.0
+        return math.sin(self.x * math.pi / 180.0)
+
+add_device(Sinusoid("phase"), True)
+add_device(Sinusoid("bpm_q"), True)
+
+add_device(Sinusoid("center_x"), True)
+add_device(Sinusoid("center_y"), True)
+center_x.setPolling(100)
+center_y.setPolling(100)
\ No newline at end of file
diff --git a/script/SARUN02_MCOR_scan.py b/script/test/SARUN02_MCOR_scan.py
similarity index 100%
rename from script/SARUN02_MCOR_scan.py
rename to script/test/SARUN02_MCOR_scan.py
diff --git a/script/phase_scan_dv.py b/script/test/phase_scan_dv.py
similarity index 100%
rename from script/phase_scan_dv.py
rename to script/test/phase_scan_dv.py
diff --git a/script/test_Simona.py b/script/test/test_Simona.py
similarity index 100%
rename from script/test_Simona.py
rename to script/test/test_Simona.py