@@ -21,6 +21,7 def verifyCmdArguments(): | |||||
21 | wpath = None |
|
21 | wpath = None | |
22 | save_figure = None |
|
22 | save_figure = None | |
23 | save_pdata = None |
|
23 | save_pdata = None | |
|
24 | id_rti = None | |||
24 |
|
25 | |||
25 | longarglist = ['path=', |
|
26 | longarglist = ['path=', | |
26 | 'startDate=', |
|
27 | 'startDate=', | |
@@ -34,6 +35,7 def verifyCmdArguments(): | |||||
34 | 'gpath=', |
|
35 | 'gpath=', | |
35 | 'wpath=', |
|
36 | 'wpath=', | |
36 | 'save_figure=', |
|
37 | 'save_figure=', | |
|
38 | 'id_rti=', | |||
37 | 'save_pdata=' |
|
39 | 'save_pdata=' | |
38 | ] |
|
40 | ] | |
39 |
|
41 | |||
@@ -62,6 +64,8 def verifyCmdArguments(): | |||||
62 | gpath = opt[1] |
|
64 | gpath = opt[1] | |
63 | elif opt[0] == '--wpath': |
|
65 | elif opt[0] == '--wpath': | |
64 | wpath = opt[1] |
|
66 | wpath = opt[1] | |
|
67 | elif opt[0] == '--id_rti': | |||
|
68 | id_rti = opt[1] | |||
65 | elif opt[0] == '--save_figure': |
|
69 | elif opt[0] == '--save_figure': | |
66 | save_figure = bool(int(opt[1])) |
|
70 | save_figure = bool(int(opt[1])) | |
67 | elif opt[0] == '--save_pdata': |
|
71 | elif opt[0] == '--save_pdata': | |
@@ -72,7 +76,7 def verifyCmdArguments(): | |||||
72 | sys.exit(-1) |
|
76 | sys.exit(-1) | |
73 |
|
77 | |||
74 | #print path,startDate,startTime,endDate,endTime,xmin,xmax,zmin,zmax |
|
78 | #print path,startDate,startTime,endDate,endTime,xmin,xmax,zmin,zmax | |
75 | return path,startDate,startTime,endDate,endTime,xmin,xmax,zmin,zmax,gpath,save_figure,wpath,save_pdata |
|
79 | return path,startDate,startTime,endDate,endTime,xmin,xmax,zmin,zmax,gpath,save_figure,id_rti,wpath,save_pdata | |
76 |
|
80 | |||
77 |
|
81 | |||
78 | desc = "EWDrifts+Imaging+Faraday Experiment" |
|
82 | desc = "EWDrifts+Imaging+Faraday Experiment" | |
@@ -87,7 +91,7 path = '/home/dsuarez/.gvfs/data on 10.10.20.13/EW_Faraday_imaging/d2013270' | |||||
87 | path = '/home/dsuarez/.gvfs/data on 10.10.20.13/EW_Faraday_imaging/d2013267' |
|
91 | path = '/home/dsuarez/.gvfs/data on 10.10.20.13/EW_Faraday_imaging/d2013267' | |
88 | path = '/home/dsuarez/.gvfs/data on 10.10.20.13/Imaging_Driver4' |
|
92 | path = '/home/dsuarez/.gvfs/data on 10.10.20.13/Imaging_Driver4' | |
89 |
|
93 | |||
90 | path,startDate,startTime,endDate,endTime,xmin,xmax,zmin,zmax,gpath,save_figure,wpath,save_pdata = verifyCmdArguments() |
|
94 | path,startDate,startTime,endDate,endTime,xmin,xmax,zmin,zmax,gpath,save_figure,id_rti,wpath,save_pdata = verifyCmdArguments() | |
91 |
|
95 | |||
92 |
|
96 | |||
93 | readUnitConfObj = controllerObj.addReadUnit(datatype='Voltage', |
|
97 | readUnitConfObj = controllerObj.addReadUnit(datatype='Voltage', | |
@@ -135,7 +139,7 opObj11.addParameter(name='timeInterval', value='5', format='float') | |||||
135 |
|
139 | |||
136 |
|
140 | |||
137 | opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') |
|
141 | opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other') | |
138 |
opObj11.addParameter(name='id', value= |
|
142 | opObj11.addParameter(name='id', value=id_rti, format='int') | |
139 | opObj11.addParameter(name='wintitle', value='Imaging', format='str') |
|
143 | opObj11.addParameter(name='wintitle', value='Imaging', format='str') | |
140 | opObj11.addParameter(name='showprofile', value='0', format='int') |
|
144 | opObj11.addParameter(name='showprofile', value='0', format='int') | |
141 | opObj11.addParameter(name='xmin', value=xmin, format='float') |
|
145 | opObj11.addParameter(name='xmin', value=xmin, format='float') |
General Comments 0
You need to be logged in to leave comments.
Login now