diff --git a/script/Sridhar/EnergyScanID1only.py b/script/Sridhar/EnergyScanID1only.py
index bb1345b..67da9ac 100644
--- a/script/Sridhar/EnergyScanID1only.py
+++ b/script/Sridhar/EnergyScanID1only.py
@@ -74,7 +74,7 @@ number_of_scans = 1
###############################################################################
caput ("X11PHS-E:OPT","PGM+ID1")
-caput(OTF_OFF2,-50) #detune ID2
+#caput(OTF_OFF2,-50) #detune ID2
wait_channel(OTF_DONE, 1, type = 'i')
if RUNTYPE in ["+/-", "+", "-"]:
@@ -102,13 +102,13 @@ elif RUNTYPE in ["LH/LV", "LH", "LV"]:
else:
raise Exception("Invalid run type: " + RUNTYPE)
-open_vg10()
-time.sleep(0.5)
-open_vg11()
-time.sleep(0.5)
-open_vg12()
-time.sleep(0.5)
-open_vg13()
+#open_vg10()
+#time.sleep(0.5)
+#open_vg11()
+#time.sleep(0.5)
+#open_vg12()
+#time.sleep(0.5)
+#open_vg13()
###############################################################################
#Main scan loop
@@ -173,7 +173,7 @@ for scan_no in range(number_of_scans):
fid = fid + 1
caput(OTF_ESET, E1)
-close_vg13()
+#close_vg13()
print "Finished Energy scan"
diff --git a/script/Sridhar/EnergyScanID2only.py b/script/Sridhar/EnergyScanID2only.py
index e68e012..4e600bf 100644
--- a/script/Sridhar/EnergyScanID2only.py
+++ b/script/Sridhar/EnergyScanID2only.py
@@ -74,7 +74,7 @@ number_of_scans = 1
###############################################################################
caput ("X11PHS-E:OPT","PGM+ID2")
-caput(OTF_OFF1,-50) #detune ID1
+#caput(OTF_OFF1,-50) #detune ID1
wait_channel(OTF_DONE, 1, type = 'i')
if RUNTYPE in ["+/-", "+", "-"]:
@@ -99,13 +99,13 @@ elif RUNTYPE in ["LH/LV", "LH", "LV"]:
else:
raise Exception("Invalid run type: " + RUNTYPE)
-open_vg10()
-time.sleep(0.5)
-open_vg11()
-time.sleep(0.5)
-open_vg12()
-time.sleep(0.5)
-open_vg13()
+#open_vg10()
+#time.sleep(0.5)
+#open_vg11()
+#time.sleep(0.5)
+#open_vg12()
+#time.sleep(0.5)
+#open_vg13()
###############################################################################
#Main scan loop
@@ -170,7 +170,7 @@ for scan_no in range(number_of_scans):
fid = fid + 1
caput(OTF_ESET, E1)
-close_vg13()
+#close_vg13()
print "Finished Energy scan"
diff --git a/script/Sridhar/field_sweepID1.py b/script/Sridhar/field_sweepID1.py
index 35fcec6..9ae989c 100644
--- a/script/Sridhar/field_sweepID1.py
+++ b/script/Sridhar/field_sweepID1.py
@@ -22,8 +22,8 @@ RANGES = [(B1, B2, -BSTEP),(B2,B1,BSTEP)]
# Here polarization and offsets are set
caput ("X11PHS-E:OPT","PGM+ID1")
-caput(OTF_OFF1,OFFSET1) #detune ID1
-caput(OTF_OFF2,OFFSET2)
+#caput(OTF_OFF2,-50) #detune ID2
+caput(OTF_OFF1,OFFSET1)
wait_channel(OTF_DONE, 1, type = 'i')
if MODE is 1 or 2:
diff --git a/script/Sridhar/field_sweepID2.py b/script/Sridhar/field_sweepID2.py
index 022a433..0c73f5e 100644
--- a/script/Sridhar/field_sweepID2.py
+++ b/script/Sridhar/field_sweepID2.py
@@ -22,7 +22,7 @@ RANGES = [(B1, B2, -BSTEP),(B2,B1,BSTEP)]
# Here polarization and offsets are set
caput ("X11PHS-E:OPT","PGM+ID2")
-caput(OTF_OFF1,OFFSET1) #detune ID1
+#caput(OTF_OFF1,-50) #detune ID1
caput(OTF_OFF2,OFFSET2)
wait_channel(OTF_DONE, 1, type = 'i')
diff --git a/script/harmonic_ID2.xml b/script/harmonic_ID2.xml
index 5dd836f..5bb27cb 100644
--- a/script/harmonic_ID2.xml
+++ b/script/harmonic_ID2.xml
@@ -2,15 +2,15 @@
-
+
-
+
- 700.0
- 720.0
- 0.5
+ 785.0
+ 795.0
+ 1.0
@@ -19,7 +19,7 @@
-
+
diff --git a/script/scan_horizontal_outfocus.xml b/script/scan_horizontal_outfocus.xml
index a7cf996..13fe5d7 100644
--- a/script/scan_horizontal_outfocus.xml
+++ b/script/scan_horizontal_outfocus.xml
@@ -5,9 +5,9 @@
- 9.0
- 18.0
- 0.1
+ 10.0
+ 20.0
+ 0.25
@@ -18,16 +18,24 @@
+
- 709.4 700
+ 782.7 778
+
+
+
+
+
@@ -35,4 +43,6 @@ def process(c,d):
+
+
diff --git a/script/scan_vertical.xml b/script/scan_vertical.xml
index d8e7cdb..cbd3bc3 100644
--- a/script/scan_vertical.xml
+++ b/script/scan_vertical.xml
@@ -5,9 +5,9 @@
- 9.0
- 17.0
- 0.25
+ 3.0
+ 20.0
+ 0.5
@@ -17,16 +17,24 @@
+
- 709.4 700
+ 782.7 778
+
+
+
+
+
@@ -34,4 +42,6 @@ def process(c,d):
+
+