ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitProd/TreeFiller/src/FillMitTree.cc
(Generate patch)

Comparing UserCode/MitProd/TreeFiller/src/FillMitTree.cc (file contents):
Revision 1.41 by bendavid, Fri Mar 20 18:47:46 2009 UTC vs.
Revision 1.46 by loizides, Tue Aug 11 17:28:57 2009 UTC

# Line 13 | Line 13
13   #include "MitProd/TreeFiller/interface/FillerCaloMet.h"
14   #include "MitProd/TreeFiller/interface/FillerCaloTaus.h"
15   #include "MitProd/TreeFiller/interface/FillerCaloTowers.h"
16 – #include "MitProd/TreeFiller/interface/FillerConversionElectrons.h"
16   #include "MitProd/TreeFiller/interface/FillerConversions.h"
17   #include "MitProd/TreeFiller/interface/FillerDecayParts.h"
18   #include "MitProd/TreeFiller/interface/FillerElectrons.h"
19   #include "MitProd/TreeFiller/interface/FillerGenJets.h"
20 < #include "MitProd/TreeFiller/interface/FillerMetaInfos.h"
20 > #include "MitProd/TreeFiller/interface/FillerGenMet.h"
21   #include "MitProd/TreeFiller/interface/FillerMCEventInfo.h"
22   #include "MitProd/TreeFiller/interface/FillerMCParticles.h"
23   #include "MitProd/TreeFiller/interface/FillerMet.h"
24   #include "MitProd/TreeFiller/interface/FillerMetaInfos.h"
25 + #include "MitProd/TreeFiller/interface/FillerMetaInfos.h"
26   #include "MitProd/TreeFiller/interface/FillerMuons.h"
27   #include "MitProd/TreeFiller/interface/FillerPFCandidates.h"
28   #include "MitProd/TreeFiller/interface/FillerPFJets.h"
# Line 145 | Line 145 | void FillMitTree::beginJob(const edm::Ev
145      edm::LogInfo("FillMitTree::beginJob") << "Booking for " << (*iF)->Name() << endl;
146      (*iF)->BookDataBlock(*tws_);
147    }
148 +
149 +  // call branch ref for the event tree
150 +  tws_->GetTree()->BranchRef();
151   }
152  
153   //--------------------------------------------------------------------------------------------------
# Line 167 | Line 170 | bool FillMitTree::configure(const edm::P
170      if (cfg.existsAs<ParameterSet>(name,0)) {
171        ParameterSet next(cfg.getUntrackedParameter<ParameterSet>(name));
172        if (!next.exists("fillerType")) {
173 <        edm::LogError("FillMitTree") << "Can not determine fillerType for pset named "
173 >        edm::LogError("FillMitTree") << "Cannot determine fillerType for pset named "
174                                       << name << std::endl;
175          throw edm::Exception(edm::errors::Configuration, "FillMitTree::configure\n")
176 <          << "Can not determine fillerType for pset named "
176 >          << "Cannot determine fillerType for pset named "
177            << name << std::endl;
178        }
179        ftype = next.getUntrackedParameter<string>("fillerType");
# Line 232 | Line 235 | bool FillMitTree::configure(const edm::P
235        addActiveFiller(fillerMet);
236        continue;
237      }  
238 +    
239 +    if (ftype.compare("FillerGenMet")==0) {
240 +      FillerGenMet *fillerGenMet = new FillerGenMet(cfg, name.c_str(), defactive_);
241 +      addActiveFiller(fillerGenMet);
242 +      continue;
243 +    }  
244  
245      if (ftype.compare("FillerCaloMet")==0) {
246        FillerCaloMet *fillerCaloMet = new FillerCaloMet(cfg, name.c_str(), defactive_);
# Line 277 | Line 286 | bool FillMitTree::configure(const edm::P
286        continue;
287      }  
288  
280 –    if (ftype.compare("FillerConversionElectrons")==0) {
281 –      FillerConversionElectrons *fillerConversionElectrons =
282 –        new FillerConversionElectrons(cfg, name.c_str(), defactive_);
283 –      addActiveFiller(fillerConversionElectrons);
284 –      continue;
285 –    }  
286 –
289      if (ftype.compare("FillerConversions")==0) {
290        FillerConversions *fillerConversions = new FillerConversions(cfg, name.c_str(), defactive_);
291        addActiveFiller(fillerConversions);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines