← Back to branch summary

~9marusia6/maus/beamlinesimulation

« back to all changes in this revision

Viewing changes to bin/utilities/execute_against_data.py

  • Committer: justinchristensen at berkeley
  • Date: 2012-06-08 08:47:52 UTC
  • mfrom: (669.1.1 release)
  • Revision ID: justinchristensen@berkeley.edu-20120608084752-5x3f3rzflhhcewwi
new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/utilities/execute_against_data.py
288
288
                                                          (self.input_file_name)
289
289
        self.run_number_as_string = str(self.run_number).rjust(5, '0')
290
290
        self.tar_file_name = self.run_number_as_string+"_offline.tar"
291
 
        self.recon_file_name = self.run_number_as_string+"_recon.json"
292
 
        self.mc_file_name = self.run_number_as_string+"_sim.json"
 
291
        self.recon_file_name = self.run_number_as_string+"_recon.root"
 
292
        self.mc_file_name = self.run_number_as_string+"_sim.root"
293
293
        self.maus_root_dir = os.environ["MAUS_ROOT_DIR"]
294
294
        self.download_target = 'downloads'
295
295
 
320
320
        return [
321
321
            '-simulation_geometry_filename', \
322
322
                   os.path.join(self.download_target, 'ParentGeometryFile.dat'),
323
 
            '-output_json_file_name', self.mc_file_name,
 
323
            '-output_root_file_name', self.mc_file_name,
324
324
            '-verbose_level', '0',
325
325
        ]
326
326
    
336
336
        return [
337
337
            '-reconstruction_geometry_filename', os.path.join \
338
338
                               (self.download_target, 'ParentGeometryFile.dat'),
339
 
            '-output_json_file_name', str(self.recon_file_name),
 
339
            '-output_root_file_name', str(self.recon_file_name),
340
340
            '-daq_data_file', str(self.run_number),
341
341
            '-daq_data_path', './',
342
342
            '-verbose_level', '0',