diff --git a/script/CalibrateGonio.py b/script/CalibrateGonio.py
index bf4704d..87be595 100644
--- a/script/CalibrateGonio.py
+++ b/script/CalibrateGonio.py
@@ -3,34 +3,36 @@ EEdge=9.
 start=EEdge-0.3
 step=0.01
 sleepTime=0.5
-for i in range(0,5):
-    caput("X10DA-OP1-MO1:BraggEAO",start+step*i) 
-    time.sleep(sleepTime)
-EnergyGonio=caget("X10DA-OP1-MO1:BraggERdbkAO")
-EnergyAbsolut=caget("X10DA-OP1-MO1:ENC-ROTXEnergy.VAL")
-OldOffset=caget("X10DA-OP1-MO1:ROTX.OFF")
-print("OldOffset=",OldOffset)
-print ("BeforeCalibration", EnergyGonio,EnergyAbsolut)
+
+def GetEnergies():
+    global: EnergyGonio, EnergyAbsolut,Offset
+    for i in range(0,5):
+        caput("X10DA-OP1-MO1:BraggEAO",start+step*i) 
+        time.sleep(sleepTime)
+
+    EnergyGonio=caget("X10DA-OP1-MO1:BraggERdbkAO")
+    EnergyAbsolut=caget("X10DA-OP1-MO1:ENC-ROTXEnergy.VAL")
+    Offset=caget("X10DA-OP1-MO1:ROTX.OFF")
+    print ("Gonio, Absolut, Offset", EnergyGonio,EnergyAbsolut, Offset)
+
+
+GetEnergies()
+#for i in range(0,5):
+#    caput("X10DA-OP1-MO1:BraggEAO",start+step*i) 
+#    time.sleep(sleepTime)
+#EnergyGonio=caget("X10DA-OP1-MO1:BraggERdbkAO")
+#EnergyAbsolut=caget("X10DA-OP1-MO1:ENC-ROTXEnergy.VAL")
+#OldOffset=caget("X10DA-OP1-MO1:ROTX.OFF")
+#print ("BeforeCalibration", EnergyGonio,EnergyAbsolut, OldOffset)
+
 BraggGonio1=caget("X10DA-OP1-MO1:BraggThetaAO.VAL")
 caput("X10DA-OP1-MO1:BraggEAO",EnergyAbsolut)
 time.sleep(sleepTime)
-
 BraggGonio2=caget("X10DA-OP1-MO1:BraggThetaAO.VAL")
-EnergyGonio2=caget("X10DA-OP1-MO1:BraggERdbkAO")
-EnergyAbsolut2=caget("X10DA-OP1-MO1:ENC-ROTXEnergy.VAL")
 
-print ("BeforeCalibration", EnergyGonio2,EnergyAbsolut2)
-
-NewOffset=OldOffset+BraggGonio2-BraggGonio1
+NewOffset=Offset+BraggGonio2-BraggGonio1
 caput("X10DA-OP1-MO1:ROTX.OFF", NewOffset)
 time.sleep(sleepTime)
 
-for i in range(0,5):
-    caput("X10DA-OP1-MO1:BraggEAO",start+step*i) 
-    time.sleep(sleepTime)
+GetEnergies()
 
-
-EnergyGonio=caget("X10DA-OP1-MO1:BraggERdbkAO")
-EnergyAbsolut=caget("X10DA-OP1-MO1:ENC-ROTXEnergy.VAL")
-print ("AfterCalibration", EnergyGonio,EnergyAbsolut)
-print("NewOffset=",NewOffset)