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.44 by bendavid, Tue Jul 14 13:47:16 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/FillerGenMet.h"
21   #include "MitProd/TreeFiller/interface/FillerMetaInfos.h"
22   #include "MitProd/TreeFiller/interface/FillerMCEventInfo.h"
23   #include "MitProd/TreeFiller/interface/FillerMCParticles.h"
# Line 167 | Line 167 | bool FillMitTree::configure(const edm::P
167      if (cfg.existsAs<ParameterSet>(name,0)) {
168        ParameterSet next(cfg.getUntrackedParameter<ParameterSet>(name));
169        if (!next.exists("fillerType")) {
170 <        edm::LogError("FillMitTree") << "Can not determine fillerType for pset named "
170 >        edm::LogError("FillMitTree") << "Cannot determine fillerType for pset named "
171                                       << name << std::endl;
172          throw edm::Exception(edm::errors::Configuration, "FillMitTree::configure\n")
173 <          << "Can not determine fillerType for pset named "
173 >          << "Cannot determine fillerType for pset named "
174            << name << std::endl;
175        }
176        ftype = next.getUntrackedParameter<string>("fillerType");
# Line 232 | Line 232 | bool FillMitTree::configure(const edm::P
232        addActiveFiller(fillerMet);
233        continue;
234      }  
235 +    
236 +    if (ftype.compare("FillerGenMet")==0) {
237 +      FillerGenMet *fillerGenMet = new FillerGenMet(cfg, name.c_str(), defactive_);
238 +      addActiveFiller(fillerGenMet);
239 +      continue;
240 +    }  
241  
242      if (ftype.compare("FillerCaloMet")==0) {
243        FillerCaloMet *fillerCaloMet = new FillerCaloMet(cfg, name.c_str(), defactive_);
# Line 277 | Line 283 | bool FillMitTree::configure(const edm::P
283        continue;
284      }  
285  
280 –    if (ftype.compare("FillerConversionElectrons")==0) {
281 –      FillerConversionElectrons *fillerConversionElectrons =
282 –        new FillerConversionElectrons(cfg, name.c_str(), defactive_);
283 –      addActiveFiller(fillerConversionElectrons);
284 –      continue;
285 –    }  
286 –
286      if (ftype.compare("FillerConversions")==0) {
287        FillerConversions *fillerConversions = new FillerConversions(cfg, name.c_str(), defactive_);
288        addActiveFiller(fillerConversions);

Diff Legend

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