Maria Haupt / ctools

Commit 5a020d92a9d944bb31ba1d8f54e6ee616aa29863

Authored by knodlseder
1 parent 16f7d57c

write out also values and uncertainties

Inline Side-by-side
Showing 1 changed file with 9 additions and 8 deletions
scripts/cspull.py
  View file @5a020d9
... ... @@ -215,7 +215,7 @@ class cspull(GApplication):
215 215 else:
216 216 file = open(self.m_outfile, 'a')
217 217 writer = csv.DictWriter(file, result['colnames'])
218   - writer.writerow(result['pulls'])
  218 + writer.writerow(result['values'])
219 219 file.close()
220 220  
221 221 # Return
... ... @@ -295,8 +295,6 @@ class cspull(GApplication):
295 295 # Gather results
296 296 colnames = []
297 297 values = {}
298   - errors = {}
299   - pulls = {}
300 298 for i in range(models.size()):
301 299 model = models[i]
302 300 model_name = model.name()
... ... @@ -306,7 +304,11 @@ class cspull(GApplication):
306 304  
307 305 # Set parameter name
308 306 name = model_name+"_"+par.name()
  307 +
  308 + # Append parameter, Pull_parameter and Unc_parameter
309 309 colnames.append(name)
  310 + colnames.append("Pull_"+name)
  311 + colnames.append("Unc_"+name)
310 312  
311 313 # Compute pull
312 314 fitted_value = par.value()
... ... @@ -317,10 +319,10 @@ class cspull(GApplication):
317 319 else:
318 320 pull = 99.0
319 321  
320   - # Store pull
  322 + # Store results
321 323 values[name] = fitted_value
322   - errors[name] = error
323   - pulls[name] = pull
  324 + values["Pull_"+name] = pull
  325 + values["Unc_"+name] = error
324 326  
325 327 # Write result
326 328 if self.logExplicit():
... ... @@ -333,8 +335,7 @@ class cspull(GApplication):
333 335 self.log(")\n")
334 336  
335 337 # Bundle together results
336   - result = {'colnames': colnames, 'values': values, \
337   - 'errors': errors, 'pulls': pulls}
  338 + result = {'colnames': colnames, 'values': values}
338 339  
339 340 # Return
340 341 return result
... ...