Changeset d870fc5 in git for converters/root2lhco.cpp

Timestamp:

Dec 21, 2014, 4:03:35 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d77b51d

Parents:

7f12612 (diff), e5767b57 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'upstream/master'

File:

• converters/root2lhco.cpp (modified) (3 diffs)

converters/root2lhco.cpp

@@ -2 +2 @@
  *  Delphes: a framework for fast simulation of a generic collider experiment
  *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -108 +108 @@
 
 LHCOWriter::LHCOWriter(ExRootTreeReader *treeReader, FILE *outputFile) :
-  fTriggerWord(0), fEventNumber(1), fTreeReader(0), fOutputFile(0)
+  fTriggerWord(0), fEventNumber(1), fTreeReader(0), fOutputFile(0),
+  fBranchEvent(0), fBranchTrack(0), fBranchTower(0), fBranchPhoton(0),
+  fBranchElectron(0), fBranchMuon(0), fBranchJet(0), fBranchMissingET(0)
 {
   fTreeReader = treeReader;
@@ -117 +119 @@
   // reconstructed tracks
   fBranchTrack = fTreeReader->UseBranch("Track");
-  fItTrack = fBranchTrack->MakeIterator();
   // calorimeter towers
   fBranchTower = fTreeReader->UseBranch("Tower");
-  fItTower = fBranchTower->MakeIterator();
   // reconstructed photons
   fBranchPhoton = fTreeReader->UseBranch("Photon");
-  fItPhoton = fBranchPhoton->MakeIterator();
   // reconstructed electrons
   fBranchElectron = fTreeReader->UseBranch("Electron");
-  fItElectron = fBranchElectron->MakeIterator();
   // reconstructed muons
   fBranchMuon = fTreeReader->UseBranch("Muon");
-  fItMuon = fBranchMuon->MakeIterator();
   // reconstructed jets
   fBranchJet = fTreeReader->UseBranch("Jet");
-  fItJet = fBranchJet->MakeIterator();
   // missing transverse energy
   fBranchMissingET = fTreeReader->UseBranch("MissingET");
+
+  if(!fBranchEvent || !fBranchTrack || !fBranchTower || !fBranchPhoton ||
+     !fBranchElectron || !fBranchMuon || !fBranchJet || !fBranchMissingET)
+  {
+    throw runtime_error("ROOT file doesn't contain all required branches");
+  }
+
+  fItTrack = fBranchTrack->MakeIterator();
+  fItTower = fBranchTower->MakeIterator();
+  fItPhoton = fBranchPhoton->MakeIterator();
+  fItElectron = fBranchElectron->MakeIterator();
+  fItMuon = fBranchMuon->MakeIterator();
+  fItJet = fBranchJet->MakeIterator();
 }