Fork me on GitHub

Changeset 91acc76 in git for modules


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

Location:
modules
Files:
4 added
2 edited

Legend:

Unmodified
Added
Removed
  • 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
Note: See TracChangeset for help on using the changeset viewer.