diff --git a/script/EnergyScan.py b/script/EnergyScan.py
index e206f9c..6409327 100644
--- a/script/EnergyScan.py
+++ b/script/EnergyScan.py
@@ -17,22 +17,72 @@ OFFSET2 = -1.0 #eV
 PREFIX = 'Data'
 RUNTYPE = "+/-"
 ROUNDS = 1
+PLOT_TYPE = 1
 """
 print "\nStarting energy scan - Parameters: ",
-print E1,E2,TIME,DELAY,OFFSET1,OFFSET2,RUNTYPE #,ALPHA
+print E1,E2,TIME,DELAY,OFFSET1,OFFSET2,RUNTYPE,ALPHA1,ALPHA2
 
-#fid = caget(OTF_FID, 'i')
 
-def switchpol(activeID):
+###############################################################################
+# Plotting
+###############################################################################
+
+running = False
+quit_plot = False
+
+def _startPlot(type):
+    global running, quit_plot
+    print "Starting plot: type " + str(type)
+    quit_plot = False
+    running = True
+    p = plot(None,name="")[0]
+    p.addSeries(LinePlotSeries("Energy"))
+    s= p.getSeries(1)
+    cur = 0
+    while running:    
+        try:
+            if  otf_start.read() == 0:
+                break
+            e = energy.read()
+            if (abs(e-cur)) > 0.1:            
+                v = keithley_2a.read() / ((keithley_1a if (type==1) else keithley_3a).read() )
+                p.getSeries(1).appendData(e,v)    
+                cur = e
+            time.sleep(0.2)
+        except:
+            pass
+    quit_plot = True
+    print "Done Plotting"
+            
+
+def startPlot(type = 1):
+    ret = fork((_startPlot,(type,)),)
+
+def stopPlot():
+    global running, quit_plot
+    running = False
+    while quit_plot==False:
+        time.sleep(0.001)
+
+###############################################################################
+
+
+def switchpol(activeID, runtype):
     global pol_str
     if activeID == 1:
         caput(OTF_OFF1,OFFSET1)
         caput(OTF_OFF2,OFFSET2-40) #detune ID2
-        pol_str = "circ +"
+        if runtype in ["+/-", "+"]:
+            pol_str = "circ +"
+        elif runtype in ["LH/LV", "LH"]:
+            pol_str = "Lin. Horizontal"
     elif activeID == 2:
         caput(OTF_OFF1,OFFSET1-40) #detune ID1
         caput(OTF_OFF2,OFFSET2)
-        pol_str = "circ -"
+        if runtype in ["+/-", "-"]:
+            pol_str = "circ -"
+        elif runtype in ["LH/LV", "LV"]:
+            pol_str = "Lin. Vertical"
     else:
         raise Exception("Invalid parameter")
 
@@ -54,19 +104,29 @@ if RUNTYPE in ["+/-", "+" , "-"]:
         number_of_scans = 2 * ROUNDS
     else: 
         number_of_scans = ROUNDS
+elif RUNTYPE in ["LH/LV", "LH", "LV"]:
+    caput(OTF_MODE1,0)
+    caput(OTF_MODE2,0)
+    wait_channel(OTF_DONE, 1, type = 'i')
+    caput(OTF_ALPHA1, 0.0)  # LH in ID1
+    caput(OTF_ALPHA2, 90.0) # LV in ID2
+    wait_channel(OTF_DONE, 1, type = 'i')
+    if RUNTYPE == "LH/LV":
+        number_of_scans = 2 * ROUNDS
+    else:
+        number_of_scans = ROUNDS
 else:
     raise Exception("Invalid run type: " +  RUNTYPE)
 
-if RUNTYPE == "-":
-    switchpol(2) # tune ID2 --> polarization: C-
+if RUNTYPE in ["-", "LV"]:
+    switchpol(2, RUNTYPE) # tune ID2 --> polarization: C- or LV
     polswitch = 0
-else:
-    switchpol(1) # tune ID1 --> polarization: C+
+elif RUNTYPE in ["+/-", "+", "LH/LV", "LH"]:
+    switchpol(1, RUNTYPE) # tune ID1 --> polarization: C+ or LH
 time.sleep(1.0)
 
 wait_channel(OTF_DONE, 1, type = 'i')
 
-open_vg10()
 open_vg13()
 
 for scan_no  in range(number_of_scans):
@@ -80,16 +140,18 @@ for scan_no  in range(number_of_scans):
     caput(OTF_FID,fid)
     time.sleep(2.0) 
     caput(OTF_ESET, E1)
-    wait_channel(OTF_DONE, 1, type = 'i')    #???
+    wait_channel(OTF_DONE, 1, type = 'i')
     time.sleep(DELAY)    
     time.sleep(2.0)
 
+    startPlot(PLOT_TYPE)
     #Start the OTF scan
     caput(OTF_START, 'GO')
 
     #Wait until scan is done
     wait_channel(OTF_START, 'STOP', type = 's')
     time.sleep(3.0)
+    stopPlot()
 
     #Convert file
     output_file = output_path+"os"+file_prefix+"_" + suffix + ".dat"
@@ -98,14 +160,16 @@ for scan_no  in range(number_of_scans):
     convert_file(input_file, output_file, pol_str)
     plot_file(output_file, file_prefix+"_" + suffix) #"Scan " + str(scan_no+1))
 
-    if RUNTYPE == "+/-":
+    if RUNTYPE in ["+/-", "LH/LV"]:
         if polswitch == 1:
-            switchpol(2) # tune ID2 --> polarization:C-
+            switchpol(2, RUNTYPE) # tune ID2 --> polarization: C- or LV
             polswitch = 0
         else:
             polswitch = 1
-            switchpol(1) # tune ID1 --> polarization:C+
-
+            switchpol(1, RUNTYPE) # tune ID1 --> polarization: C+ or LH
+    else:
+        raise Exception("running in one polarization mode, no switching")
+        
     time.sleep(3.0)
     fid = fid + 1