@@ -93,7 +93,7 class JARSConfiguration(Configuration): | |||
|
93 | 93 | acq_link = models.BooleanField(verbose_name='Acquisition Link', default=True) |
|
94 | 94 | view_raw_data = models.BooleanField(verbose_name='View Raw Data', default=True) |
|
95 | 95 | save_ch_dc = models.BooleanField(verbose_name='Save Channels DC', default=True) |
|
96 | filter_parms = models.CharField(max_length=10000, default='{}') | |
|
96 | filter_parms = models.CharField(max_length=10000, default='{}') | |
|
97 | 97 | |
|
98 | 98 | class Meta: |
|
99 | 99 | db_table = 'jars_configurations' |
@@ -103,8 +103,9 class JARSConfiguration(Configuration): | |||
|
103 | 103 | parameters = {} |
|
104 | 104 | |
|
105 | 105 | parameters['name'] = self.name |
|
106 | parameters['rc'] = self.rc.name | |
|
106 | #parameters['rc'] = self.rc.name | |
|
107 | 107 | parameters['exp_type'] = self.exp_type |
|
108 | parameters['exptype'] = EXPERIMENT_TYPE[self.exp_type][1] | |
|
108 | 109 | parameters['cards_number'] = self.cards_number |
|
109 | 110 | parameters['channels_number'] = self.channels_number |
|
110 | 111 | parameters['channels'] = self.channels |
@@ -113,11 +114,22 class JARSConfiguration(Configuration): | |||
|
113 | 114 | parameters['data_type'] = self.data_type |
|
114 | 115 | parameters['acq_profiles'] = self.acq_profiles |
|
115 | 116 | parameters['profiles_block'] = self.profiles_block |
|
117 | parameters['fftpoints'] = self.fftpoints | |
|
118 | parameters['cohe_integr'] = self.cohe_integr | |
|
119 | #parameters['incohe_integr'] = self.incohe_integr | |
|
116 | 120 | parameters['filter'] = self.filter.name |
|
121 | #parameters['spectral_number'] = self.spectral_number | |
|
122 | #parameters['spectral'] = self.spectral | |
|
117 | 123 | parameters['create_directory'] = bool(self.create_directory) |
|
118 | 124 | parameters['include_expname'] = bool(self.include_expname) |
|
119 | 125 | parameters['acq_link'] = bool(self.acq_link) |
|
120 |
parameters['view_raw_data'] = bool(self.view_raw_data) |
|
|
126 | parameters['view_raw_data'] = bool(self.view_raw_data) | |
|
127 | parameters['save_ch_dc'] = bool(self.save_ch_dc) | |
|
128 | ||
|
129 | if parameters['exptype'] == 'PDATA': | |
|
130 | parameters['incohe_integr'] = self.incohe_integr | |
|
131 | parameters['spectral_number'] = self.spectral_number | |
|
132 | parameters['spectral'] = self.spectral | |
|
121 | 133 | |
|
122 | 134 | return parameters |
|
123 | 135 | |
@@ -126,7 +138,34 class JARSConfiguration(Configuration): | |||
|
126 | 138 | self.save() |
|
127 | 139 | |
|
128 | 140 | def dict_to_parms(self, parameters): |
|
129 |
|
|
|
141 | ||
|
142 | self.exp_type = int(parameters['exp_type']) | |
|
143 | if parameters['exptype'] == 'PDATA': | |
|
144 | self.incohe_integr = parameters['incohe_integr'] | |
|
145 | self.spectral_number = parameters['spectral_number'] | |
|
146 | self.spectral = parameters['spectral'] | |
|
147 | ||
|
148 | self.cards_number = int(parameters['cards_number']) | |
|
149 | self.channels_number = int(parameters['channels_number']) | |
|
150 | self.channels = parameters['channels'] | |
|
151 | self.rd_directory = parameters['rd_directory'] | |
|
152 | self.raw_data_blocks = parameters['raw_data_blocks'] | |
|
153 | self.data_type = parameters['data_type'] | |
|
154 | self.acq_profiles = parameters['acq_profiles'] | |
|
155 | self.profiles_block = parameters['profiles_block'] | |
|
156 | self.fftpoints = parameters['fftpoints'] | |
|
157 | self.cohe_integr = parameters['cohe_integr'] | |
|
158 | ||
|
159 | filter_name = parameters['filter'] | |
|
160 | self.filter = JARS.objects.get(name=filter_name) | |
|
161 | self.save() | |
|
162 | self.add_parms_to_filter() | |
|
163 | ||
|
164 | self.create_directory = bool(parameters['create_directory']) | |
|
165 | self.include_expname = bool(parameters['include_expname']) | |
|
166 | self.acq_link = bool(parameters['acq_link']) | |
|
167 | self.view_raw_data = bool(parameters['view_raw_data']) | |
|
168 | self.save_ch_dc = bool(parameters['save_ch_dc']) | |
|
130 | 169 | |
|
131 | 170 | def status_device(self): |
|
132 | 171 | return |
General Comments 0
You need to be logged in to leave comments.
Login now