Fork me on GitHub

Changeset 91acc76 in git


Ignore:
Timestamp:
Aug 23, 2016, 3:28:48 PM (8 years ago)
Author:
Michele Selvaggi <michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
19389b8, 7993cad
Parents:
e55f5b0 (diff), 98ce52a (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:

resolved conflict in ModulesLinkDef

Files:
11 added
6 edited

Legend:

Unmodified
Added
Removed

  • CMakeLists.txt

    re55f5b0 r91acc76  
    4141  $<TARGET_OBJECTS:tcl>
    4242  $<TARGET_OBJECTS:Hector>
     43  $<TARGET_OBJECTS:PUPPI>
    4344)
    4445

  • Makefile

    re55f5b0 r91acc76  
    324324        modules/SimpleCalorimeter.h \
    325325        modules/Calorimeter.h \
     326        modules/OldCalorimeter.h \
    326327        modules/Isolation.h \
    327328        modules/EnergyScale.h \
    … …  
    732733        external/ExRootAnalysis/ExRootFilter.h \
    733734        external/ExRootAnalysis/ExRootClassifier.h
     735tmp/modules/OldCalorimeter.$(ObjSuf): \
     736        modules/OldCalorimeter.$(SrcSuf) \
     737        modules/OldCalorimeter.h \
     738        classes/DelphesClasses.h \
     739        classes/DelphesFactory.h \
     740        classes/DelphesFormula.h \
     741        external/ExRootAnalysis/ExRootResult.h \
     742        external/ExRootAnalysis/ExRootFilter.h \
     743        external/ExRootAnalysis/ExRootClassifier.h
    734744tmp/modules/ParticlePropagator.$(ObjSuf): \
    735745        modules/ParticlePropagator.$(SrcSuf) \
    … …  
    982992        tmp/modules/Merger.$(ObjSuf) \
    983993        tmp/modules/MomentumSmearing.$(ObjSuf) \
     994        tmp/modules/OldCalorimeter.$(ObjSuf) \
    984995        tmp/modules/ParticlePropagator.$(ObjSuf) \
    985996        tmp/modules/PdgCodeFilter.$(ObjSuf) \
    … …  
    10081019
    10091020tmp/external/PUPPI/PuppiAlgo.$(ObjSuf): \
    1010         external/PUPPI/PuppiAlgo.$(SrcSuf) \
    1011         external/fastjet/internal/base.hh
     1021        external/PUPPI/PuppiAlgo.$(SrcSuf)
    10121022tmp/external/PUPPI/PuppiContainer.$(ObjSuf): \
    10131023        external/PUPPI/PuppiContainer.$(SrcSuf) \
    1014         external/fastjet/internal/base.hh \
    10151024        external/fastjet/Selector.hh
    10161025tmp/external/PUPPI/puppiCleanContainer.$(ObjSuf): \
    … …  
    13701379        external/PUPPI/RecoObj2.hh \
    13711380        external/PUPPI/AlgoObj.hh \
     1381        external/PUPPI/PuppiContainer.hh \
     1382        external/fastjet/PseudoJet.hh \
    13721383        classes/DelphesClasses.h \
    13731384        classes/DelphesFactory.h \
    … …  
    17611772        @touch $@
    17621773
     1774modules/OldCalorimeter.h: \
     1775        classes/DelphesModule.h
     1776        @touch $@
     1777
    17631778external/fastjet/ClusterSequence1GhostPassiveArea.hh: \
    17641779        external/fastjet/PseudoJet.hh \
    … …  
    18051820
    18061821modules/RunPUPPI.h: \
    1807         classes/DelphesModule.h \
    1808         external/PUPPI/PuppiContainer.hh
     1822        classes/DelphesModule.h
    18091823        @touch $@
    18101824
    … …  
    19121926external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh: \
    19131927        external/fastjet/JetDefinition.hh
     1928        @touch $@
     1929
     1930external/PUPPI/PuppiContainer.hh: \
     1931        external/fastjet/PseudoJet.hh
    19141932        @touch $@
    19151933

  • external/CMakeLists.txt

    re55f5b0 r91acc76  
    33add_subdirectory(Hector)
    44add_subdirectory(tcl)
     5add_subdirectory(PUPPI)

  • modules/ModulesLinkDef.h

    re55f5b0 r91acc76  
    4040#include "modules/SimpleCalorimeter.h"
    4141#include "modules/Calorimeter.h"
     42#include "modules/OldCalorimeter.h"
    4243#include "modules/Isolation.h"
    4344#include "modules/EnergyScale.h"
    … …  
    5960#include "modules/PdgCodeFilter.h"
    6061#include "modules/BeamSpotFilter.h"
     62#include "modules/RecoPuFilter.h"
    6163#include "modules/Cloner.h"
    6264#include "modules/Weighter.h"
    … …  
    8991#pragma link C++ class SimpleCalorimeter+;
    9092#pragma link C++ class Calorimeter+;
     93#pragma link C++ class OldCalorimeter+;
    9194#pragma link C++ class Isolation+;
    9295#pragma link C++ class EnergyScale+;
    … …  
    108111#pragma link C++ class PdgCodeFilter+;
    109112#pragma link C++ class BeamSpotFilter+;
     113#pragma link C++ class RecoPuFilter+;
    110114#pragma link C++ class Cloner+;
    111115#pragma link C++ class Weighter+;

  • modules/PhotonConversions.cc

    re55f5b0 r91acc76  
    5959  fItInputArray(0), fConversionMap(0), fDecayXsec(0)
    6060{
    61   fDecayXsec = new TF1;
     61  fDecayXsec = new TF1("decayXsec","1.0 - 4.0/3.0 * x * (1.0 - x)", 0.0, 1.0);
    6262  fConversionMap = new DelphesCylindricalFormula;
    6363}
    … …  
    8484
    8585  fConversionMap->Compile(GetString("ConversionMap", "0.0"));
    86 
    87 #if  ROOT_VERSION_CODE < ROOT_VERSION(6,04,00)
    88   fDecayXsec->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");
    89 #else
    90   fDecayXsec->GetFormula()->Compile("1.0 - 4.0/3.0 * x * (1.0 - x)");
    91 #endif
    92   fDecayXsec->SetRange(0.0, 1.0);
    9386
    9487  // import array with output from filter/classifier module

  • readers/DelphesCMSFWLite.cpp

    re55f5b0 r91acc76  
    6565  ExRootTreeBranch *branchEvent, ExRootTreeBranch *branchRwgt,
    6666  DelphesFactory *factory, TObjArray *allParticleOutputArray,
    67   TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray)
     67  TObjArray *stableParticleOutputArray, TObjArray *partonOutputArray, Bool_t firstEvent)
    6868{
     69
    6970  fwlite::Handle< GenEventInfoProduct > handleGenEventInfo;
    70 
    7171  fwlite::Handle< LHEEventProduct > handleLHEEvent;
    72 
    7372  fwlite::Handle< vector< reco::GenParticle > > handleParticle;
     73
    7474  vector< reco::GenParticle >::const_iterator itParticle;
    7575
    … …  
    7878
    7979  handleGenEventInfo.getByLabel(event, "generator");
    80   handleLHEEvent.getByLabel(event, "externalLHEProducer");
    81   handleParticle.getByLabel(event, "genParticles");
     80
     81  if (!((handleLHEEvent.getBranchNameFor(event, "source")).empty()))
     82  {
     83    handleLHEEvent.getByLabel(event, "source");
     84  }
     85  else if (!((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty()))
     86  {
     87    handleLHEEvent.getByLabel(event, "externalLHEProducer");
     88  }
     89  else if (firstEvent)
     90  {
     91    std::cout<<"Wrong LHEEvent Label! Please, check the input file."<<std::endl;
     92  }
     93
     94  if (!((handleParticle.getBranchNameFor(event, "genParticles")).empty()))
     95  {
     96    handleParticle.getByLabel(event, "genParticles");
     97  }
     98  else if (!((handleParticle.getBranchNameFor(event, "prunedGenParticles")).empty()))
     99  {
     100    handleParticle.getByLabel(event, "prunedGenParticles");
     101  }
     102  else
     103  {
     104    std::cout<<"Wrong GenParticle Label! Please, check the input file."<<std::endl;
     105    exit(-1);
     106  }
     107
     108  Bool_t foundLHE = !((handleLHEEvent.getBranchNameFor(event, "source")).empty()) || !((handleLHEEvent.getBranchNameFor(event, "externalLHEProducer")).empty());
    82109
    83110  HepMCEvent *element;
    … …  
    91118  Double_t px, py, pz, e, mass;
    92119  Double_t x, y, z;
    93 
    94   const vector< gen::WeightsInfo > &vectorWeightsInfo = handleLHEEvent->weights();
    95   vector< gen::WeightsInfo >::const_iterator itWeightsInfo;
    96120
    97121  element = static_cast<HepMCEvent *>(branchEvent->NewEntry());
    … …  
    117141  element->ProcTime = 0.0;
    118142
    119   for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
    120   {
    121     weight = static_cast<Weight *>(branchRwgt->NewEntry());
    122     weight->Weight = itWeightsInfo->wgt;
     143
     144  if(foundLHE)
     145  {
     146    const vector< gen::WeightsInfo > &vectorWeightsInfo = handleLHEEvent->weights();
     147    vector< gen::WeightsInfo >::const_iterator itWeightsInfo;
     148   
     149    for(itWeightsInfo = vectorWeightsInfo.begin(); itWeightsInfo != vectorWeightsInfo.end(); ++itWeightsInfo)
     150    {
     151      weight = static_cast<Weight *>(branchRwgt->NewEntry());
     152      weight->Weight = itWeightsInfo->wgt;
     153    } 
    123154  }
    124155
    … …  
    207238  Int_t i;
    208239  Long64_t eventCounter, numberOfEvents;
     240  Bool_t firstEvent = kTRUE;
    209241
    210242  if(argc < 4)
    … …  
    281313      modularDelphes->Clear();
    282314      treeWriter->Clear();
     315
    283316      for(event.toBegin(); !event.atEnd() && !interrupted; ++event)
    284317      {
    285318        ConvertInput(event, eventCounter, branchEvent, branchRwgt, factory,
    286           allParticleOutputArray, stableParticleOutputArray, partonOutputArray);
     319          allParticleOutputArray, stableParticleOutputArray, partonOutputArray, firstEvent);
    287320        modularDelphes->ProcessTask();
     321         
     322        firstEvent = kFALSE;
    288323
    289324        treeWriter->Fill();
Note: See TracChangeset for help on using the changeset viewer.