diff --git a/Software/AutomatedMeasurements/ElectronicMonkeyCCEScan.py b/Software/AutomatedMeasurements/ElectronicMonkeyCCEScan.py
index 25c3e9b..a352c1b 100644
--- a/Software/AutomatedMeasurements/ElectronicMonkeyCCEScan.py
+++ b/Software/AutomatedMeasurements/ElectronicMonkeyCCEScan.py
@@ -89,9 +89,9 @@
 
 print 'Type of measurement: ', measurement 
 
-print 'First value of the parameter identifying the measurement: %f steps' % firstpar
-print 'Last value of the parameter identifying the measurement: %f steps' % lastpar
-print 'Step size along the value of the parameter identifying the measurement: %f steps' % steppar
+print 'First value of the parameter identifying the measurement: %.1f steps' % firstpar
+print 'Last value of the parameter identifying the measurement: %.1f steps' % lastpar
+print 'Step size along the value of the parameter identifying the measurement: %.1f steps' % steppar
 
 print 'z position: %i steps' % z
 
@@ -102,7 +102,7 @@
 print 'Number of events per DAQ: %i' % nevents
 
 # Number of scanned values of the parameter identifying the measurement.
-stepspar = ((int)lastpar-(int)firstpar)/(int)steppar+1
+stepspar = (int(lastpar)-int(firstpar))/int(steppar)+1
 print 'Number of scanned values of the parameter identifying the measurement: %i' % stepspar
 
 # Number of scanned x positions.
@@ -134,13 +134,6 @@
 # Take a pedestal run.
 if not os.path.exists(folder+"/Hans410/"+measurement):
     os.makedirs(folder+"/Hans410/"+measurement)
-if (measurement == "CCEBiasVoltageScan") :
-    filename = folder+"/Hans410/"+measurement+"/"+str(yyyymmdd)+"-"+str((int)par)+"V"+"-216-"+"ped.ali"
-elif (measurement == "CCEAttenuationScan") :
-    filename = folder+"/Hans410/"+measurement+"/"+str(yyyymmdd)+"-"+str(par)+"dB"+"-216-"+"ped.ali"
-elif (measurement == "CCEDelayScan") :
-    filename = folder+"/Hans410/"+measurement+"/"+str(yyyymmdd)+"-"+str((int)par)+"ns"+"-216-"+"ped.ali"
-else :
     filename = folder+"/Hans410/"+measurement+"/"+str(yyyymmdd)+"-216-"+"ped.ali"
 configped = config+"/FocusingConfig"
 
@@ -154,7 +147,7 @@
 for pospar in range(firstpar,lastpar+steppar,steppar) :
     # If the measurement is of type "CCEDelayScan" we need a different configuration file for each value of the delay. All these files are in "CCEDelayScanConfig" folder.
     if (measurement == "CCEDelayScan") :
-        config = config+"/CCEDelayScanConfig/"+"CCEDelayScanConfig"+(int)pospar+"ns"
+        config = config+"/CCEDelayScanConfig/"+"CCEDelayScanConfig"+str(int(pospar))+"ns"
 
     for posx in range(firstx,lastx+stepx,stepx) :
         print 'Value of the parameter identifying the measurement: %i steps' % pospar
@@ -210,4 +203,3 @@
     time.sleep(1)
 
 print 'End of the measurement!'
-