From c81fde478cab41c8449fd9423b8cb51ac9906e9c Mon Sep 17 00:00:00 2001 From: bma Date: Tue, 6 Feb 2018 20:42:05 +0100 Subject: [PATCH] replace 4 spaces by tabs --- fit_waist.py | 28 +++--- pm100d_waist.py | 276 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 152 insertions(+), 152 deletions(-) diff --git a/fit_waist.py b/fit_waist.py index 6206f00..e708bbd 100755 --- a/fit_waist.py +++ b/fit_waist.py @@ -5,7 +5,7 @@ import matplotlib.pyplot as plt '''power function to optimize''' def P(x, Po, Pmax, xo, w): - return Po+0.5*Pmax*(1.-erf(2.**0.5*(x-xo)/w)) + return Po+0.5*Pmax*(1.-erf(2.**0.5*(x-xo)/w)) '''load and fit beam section''' @@ -15,20 +15,20 @@ data_waist = [] plt.close() fig, p = plt.subplots(2, 1) for f in files: - with open(f, 'r') as dest_f: - raw = csv.reader(dest_f, delimiter = '\t', quotechar = '"') - data = [value for value in raw] - data = numpy.asarray(data, dtype = float) - xmes = data[:,0] - Pmes = data[:,1] + with open(f, 'r') as dest_f: + raw = csv.reader(dest_f, delimiter = '\t', quotechar = '"') + data = [value for value in raw] + data = numpy.asarray(data, dtype = float) + xmes = data[:,0] + Pmes = data[:,1] - '''optimization with non-linear least squares method''' - Ppopt, Pcov = curve_fit(P, xmes, Pmes) - data_waist.append([int(f[-7:-4]), abs(Ppopt[3])]) + '''optimization with non-linear least squares method''' + Ppopt, Pcov = curve_fit(P, xmes, Pmes) + data_waist.append([int(f[-7:-4]), abs(Ppopt[3])]) - '''plot''' - p[0].plot(xmes, Pmes, 'o') - p[0].plot(numpy.linspace(xmes[0], xmes[-1], 100), P(numpy.linspace(xmes[0], xmes[-1], 100), *Ppopt)) + '''plot''' + p[0].plot(xmes, Pmes, 'o') + p[0].plot(numpy.linspace(xmes[0], xmes[-1], 100), P(numpy.linspace(xmes[0], xmes[-1], 100), *Ppopt)) p[0].grid() @@ -38,7 +38,7 @@ print(data_waist) '''waist function to optimize''' def W(z, w0, z0): - return w0*(1.+((z-z0)*1542e-6/(numpy.pi*w0**2))**2)**0.5 + return w0*(1.+((z-z0)*1542e-6/(numpy.pi*w0**2))**2)**0.5 popt, cov = curve_fit(W, data_waist[:,0], data_waist[:,1]) print(popt[0], popt[1]) diff --git a/pm100d_waist.py b/pm100d_waist.py index 97bb1af..6f31fe8 100755 --- a/pm100d_waist.py +++ b/pm100d_waist.py @@ -13,166 +13,166 @@ OFILENAME = '130' #============================================================================== def parse(): - """ - Specific parsing procedure for transfering data from Thorlabs PM100D. - :returns: populated namespace (parser) - """ - parser = argparse.ArgumentParser(description = 'Acquire data from Thorlabs PM100D', - epilog = 'Example: \'./pm100d.py -st 10 -o toto\' logs PM100D every 10 seconds to output file YYYYMMDD-HHMMSS-toto.dat') - - parser.add_argument('-p', - action='store', - dest='path', - default=PATH, - help='Absolute path (default '+PATH+')') - - parser.add_argument('-o', - action='store', - dest='ofile', - default=OFILENAME, - help='Output data filename (default '+OFILENAME+')') - - args = parser.parse_args() - return args + """ + Specific parsing procedure for transfering data from Thorlabs PM100D. + :returns: populated namespace (parser) + """ + parser = argparse.ArgumentParser(description = 'Acquire data from Thorlabs PM100D', + epilog = 'Example: \'./pm100d.py -st 10 -o toto\' logs PM100D every 10 seconds to output file YYYYMMDD-HHMMSS-toto.dat') + + parser.add_argument('-p', + action='store', + dest='path', + default=PATH, + help='Absolute path (default '+PATH+')') + + parser.add_argument('-o', + action='store', + dest='ofile', + default=OFILENAME, + help='Output data filename (default '+OFILENAME+')') + + args = parser.parse_args() + return args #============================================================================== class usbtmc: - def __init__(self, device): - self.device = device - self.FILE = os.open(device, os.O_RDWR) + def __init__(self, device): + self.device = device + self.FILE = os.open(device, os.O_RDWR) - def write(self, command): - os.write(self.FILE, command); + def write(self, command): + os.write(self.FILE, command); - def read(self, length = 4000): - return os.read(self.FILE, length) + def read(self, length = 4000): + return os.read(self.FILE, length) - def getName(self): - self.write("*IDN?") - return self.read(300) + def getName(self): + self.write("*IDN?") + return self.read(300) - def sendReset(self): - self.write("*RST") + def sendReset(self): + self.write("*RST") #============================================================================== class instrument: - """Class to control a SCPI compatible instrument""" - def __init__(self, device): - print 'Connecting to device %s...' %device - self.meas = usbtmc(device) - self.name = self.meas.getName() - print self.name - print ' --> Ok' - - def write(self, command): - """Send an arbitrary command directly to the scope""" - self.meas.write(command) - - def read(self, command): - """Read an arbitrary amount of data directly from the scope""" - return self.meas.read(command) - - def reset(self): - """Reset the instrument""" - self.meas.sendReset() - - def value(self): - self.write('MEAS?') - return self.read(300) + """Class to control a SCPI compatible instrument""" + def __init__(self, device): + print 'Connecting to device %s...' %device + self.meas = usbtmc(device) + self.name = self.meas.getName() + print self.name + print ' --> Ok' + + def write(self, command): + """Send an arbitrary command directly to the scope""" + self.meas.write(command) + + def read(self, command): + """Read an arbitrary amount of data directly from the scope""" + return self.meas.read(command) + + def reset(self): + """Reset the instrument""" + self.meas.sendReset() + + def value(self): + self.write('MEAS?') + return self.read(300) #============================================================================== def acqu_PM100D(instrument, path, ofile): - t0 = time.time() - filename = time.strftime("%Y%m%d-%H%M%S", time.gmtime(t0)) + '-' + ofile + '.dat' - print('Opening %s' %filename) - data_file = open(filename, 'wr', 0) - dx = 0. - - xmes = [] - Pmes = [] - plt.ion() - fig = plt.figure() - ax1 = fig.add_subplot(111) - line1, = ax1.plot(xmes, Pmes, 'o') - - # Infinite loop - while True: - try: - keypressed = raw_input("Press Enter to continue...\n") - - if keypressed=='': - # Power values - sensors_values = instrument.value() - sensors_values = sensors_values.replace('E', 'e') - string = "%f\t%s" % (dx , sensors_values) - data_file.write(string) # Write in a file - print(string) - - xmes.append(dx) - Pmes.append(float(sensors_values)) - - dx = dx + 0.05 - - elif keypressed.isdigit(): - print('Closing %s' %filename) - data_file.close() - t0 = time.time() - filename = time.strftime("%Y%m%d-%H%M%S", time.gmtime(t0)) + '-' + keypressed + '.dat' - print('Opening %s' %filename) - data_file = open(filename, 'wr', 0) - dx = 0. - - xmes = [] - Pmes = [] - line1, = ax1.plot(xmes, Pmes, 'o') - - else: - raise KeyboardInterrupt - - - line1.set_data(xmes, Pmes) - ax1.relim() - ax1.autoscale_view() - fig.canvas.draw() - - except Exception as ex: - print 'Exception during controler data reading: ' + str(ex) - - except KeyboardInterrupt: - print '\n --> Disconnected' - data_file.close() - - # To stop the loop in a clean way - break + t0 = time.time() + filename = time.strftime("%Y%m%d-%H%M%S", time.gmtime(t0)) + '-' + ofile + '.dat' + print('Opening %s' %filename) + data_file = open(filename, 'wr', 0) + dx = 0. + + xmes = [] + Pmes = [] + plt.ion() + fig = plt.figure() + ax1 = fig.add_subplot(111) + line1, = ax1.plot(xmes, Pmes, 'o') + + # Infinite loop + while True: + try: + keypressed = raw_input("Press Enter to continue...\n") + + if keypressed=='': + # Power values + sensors_values = instrument.value() + sensors_values = sensors_values.replace('E', 'e') + string = "%f\t%s" % (dx , sensors_values) + data_file.write(string) # Write in a file + print(string) + + xmes.append(dx) + Pmes.append(float(sensors_values)) + + dx = dx + 0.05 + + elif keypressed.isdigit(): + print('Closing %s' %filename) + data_file.close() + t0 = time.time() + filename = time.strftime("%Y%m%d-%H%M%S", time.gmtime(t0)) + '-' + keypressed + '.dat' + print('Opening %s' %filename) + data_file = open(filename, 'wr', 0) + dx = 0. + + xmes = [] + Pmes = [] + line1, = ax1.plot(xmes, Pmes, 'o') + + else: + raise KeyboardInterrupt + + + line1.set_data(xmes, Pmes) + ax1.relim() + ax1.autoscale_view() + fig.canvas.draw() + + except Exception as ex: + print 'Exception during controler data reading: ' + str(ex) + + except KeyboardInterrupt: + print '\n --> Disconnected' + data_file.close() + + # To stop the loop in a clean way + break #============================================================================== def main(): - """ - Main script - """ - # Parse command line - args = parse() - # path - path = args.path - # Data output filename - ofile = args.ofile - - try: - pm100 = instrument("/dev/usbtmc0") - - # acquisition with 2 sec. timeout - acqu_PM100D(pm100, path, ofile) - - except Exception as ex: - print 'Oups '+str(ex) - print 'Program ending\n' + """ + Main script + """ + # Parse command line + args = parse() + # path + path = args.path + # Data output filename + ofile = args.ofile + + try: + pm100 = instrument("/dev/usbtmc0") + + # acquisition with 2 sec. timeout + acqu_PM100D(pm100, path, ofile) + + except Exception as ex: + print 'Oups '+str(ex) + print 'Program ending\n' #============================================================================== if __name__ == "__main__": - main() + main() -- 2.16.4