Fork me on GitHub

Changes in / [8a11cdc:dd64cff] in git


Ignore:
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • examples/CMakeLists.txt

    r8a11cdc rdd64cff  
    11include_directories(
    22  ${CMAKE_SOURCE_DIR}
    3   ${DelphesExternals_INCLUDE_DIR}
     3  ${DelphesExternals_INCLUDE_DIR} 
    44)
    55
    … …  
    1717# take all other relevant files and put them into examples/
    1818install(FILES ${macros} DESTINATION examples)
    19 install(DIRECTORY ExternalFastJet DESTINATION examples)
    20 if(PYTHIA8_FOUND)
    21   install(DIRECTORY Pythia8 DESTINATION examples)
    22 endif()

  • modules/CMakeLists.txt

    r8a11cdc rdd64cff  
    2828if (NOT ${ROOT_VERSION} VERSION_LESS "6.0.0")
    2929  install(FILES
    30     ${PROJECT_BINARY_DIR}/modules/libModulesDict_rdict.pcm
    31     ${PROJECT_BINARY_DIR}/modules/libFastJetDict_rdict.pcm
    32     DESTINATION lib)
    33   if(PYTHIA8_FOUND)
    34     install(FILES
    35       ${PROJECT_BINARY_DIR}/modules/libPythia8Dict_rdict.pcm
     30      ${PROJECT_BINARY_DIR}/modules/libModulesDict_rdict.pcm
     31      ${PROJECT_BINARY_DIR}/modules/libFastJetDict_rdict.pcm
    3632      DESTINATION lib)
    37   endif()
    3833endif()

  • modules/FastJetFinder.cc

    r8a11cdc rdd64cff  
    120120  fJetPTMin = GetDouble("JetPTMin", 10.0);
    121121
     122 
    122123  //-- N(sub)jettiness parameters --
    123124
    … …  
    129130
    130131  //-- Exclusive clustering for e+e- collisions --
    131 
     132 
    132133  fNJets = GetInt("NJets",2);
    133134  fExclusiveClustering = GetBool("ExclusiveClustering", false);
    134135
    135136  //-- Valencia Linear Collider algorithm
    136 
    137137  fGamma = GetDouble("Gamma", 1.0);
    138138  //fBeta parameter see above
    139 
     139 
    140140  fMeasureDef = new NormalizedMeasure(fBeta, fParameterR);
    141 
     141   
    142142  switch(fAxisMode)
    143143  {
    144144    default:
    145     case 1:
    146       fAxesDef = new WTA_KT_Axes();
    147       break;
    148     case 2:
    149       fAxesDef = new OnePass_WTA_KT_Axes();
    150       break;
    151     case 3:
    152       fAxesDef = new KT_Axes();
    153       break;
    154     case 4:
    155       fAxesDef = new OnePass_KT_Axes();
    156   }
     145      case 1:
     146        fAxesDef = new WTA_KT_Axes();
     147        break;
     148      case 2:
     149        fAxesDef = new OnePass_WTA_KT_Axes();
     150        break;
     151      case 3:
     152        fAxesDef = new KT_Axes();
     153        break;
     154      case 4:
     155        fAxesDef = new OnePass_KT_Axes();
     156   }
    157157
    158158  //-- Trimming parameters --
    159 
     159 
    160160  fComputeTrimming = GetBool("ComputeTrimming", false);
    161161  fRTrim = GetDouble("RTrim", 0.2);
    162162  fPtFracTrim = GetDouble("PtFracTrim", 0.05);
    163 
     163 
    164164
    165165  //-- Pruning parameters --
    166 
     166 
    167167  fComputePruning = GetBool("ComputePruning", false);
    168168  fZcutPrun = GetDouble("ZcutPrun", 0.1);
    169169  fRcutPrun = GetDouble("RcutPrun", 0.5);
    170170  fRPrun = GetDouble("RPrun", 0.8);
    171 
     171 
    172172  //-- SoftDrop parameters --
    173 
     173 
    174174  fComputeSoftDrop     = GetBool("ComputeSoftDrop", false);
    175175  fBetaSoftDrop        = GetDouble("BetaSoftDrop", 0.0);
    176176  fSymmetryCutSoftDrop = GetDouble("SymmetryCutSoftDrop", 0.1);
    177177  fR0SoftDrop= GetDouble("R0SoftDrop=", 0.8);
     178 
    178179
    179180  // ---  Jet Area Parameters ---
    180 
    181181  fAreaAlgorithm = GetInt("AreaAlgorithm", 0);
    182182  fComputeRho = GetBool("ComputeRho", false);
    … …  
    195195  switch(fAreaAlgorithm)
    196196  {
     197    case 1:
     198      fAreaDefinition = new AreaDefinition(active_area_explicit_ghosts, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
     199      break;
     200    case 2:
     201      fAreaDefinition = new AreaDefinition(one_ghost_passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
     202      break;
     203    case 3:
     204      fAreaDefinition = new AreaDefinition(passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
     205      break;
     206    case 4:
     207      fAreaDefinition = new AreaDefinition(VoronoiAreaSpec(fEffectiveRfact));
     208      break;
     209    case 5:
     210      fAreaDefinition = new AreaDefinition(active_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
     211      break;
    197212    default:
    198213    case 0:
    199214      fAreaDefinition = 0;
    200215      break;
    201     case 1:
    202       fAreaDefinition = new AreaDefinition(active_area_explicit_ghosts, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
    203       break;
    204     case 2:
    205       fAreaDefinition = new AreaDefinition(one_ghost_passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
    206       break;
    207     case 3:
    208       fAreaDefinition = new AreaDefinition(passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
    209       break;
    210     case 4:
    211       fAreaDefinition = new AreaDefinition(VoronoiAreaSpec(fEffectiveRfact));
    212       break;
    213     case 5:
    214       fAreaDefinition = new AreaDefinition(active_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
    215       break;
    216216  }
    217217
    … …  
    248248      fDefinition = new JetDefinition(fNjettinessPlugin);
    249249      break;
    250     case 9:
     250  case 9:
    251251      fValenciaPlugin = new ValenciaPlugin(fParameterR, fBeta, fGamma);
    252252      fDefinition = new JetDefinition(fValenciaPlugin);
    … …  
    255255  }
    256256
    257 
     257   
    258258
    259259  fPlugin = plugin;
    … …  
    290290  fOutputArray = ExportArray(GetString("OutputArray", "jets"));
    291291  fRhoOutputArray = ExportArray(GetString("RhoOutputArray", "rho"));
    292   fConstituentsOutputArray = ExportArray(GetString("ConstituentsOutputArray", "constituents"));
    293292}
    294293
    … …  
    326325  Double_t time, timeWeight;
    327326  Int_t number, ncharged, nneutrals;
    328   Int_t charge;
     327  Int_t charge; 
    329328  Double_t rho = 0.0;
    330329  PseudoJet jet, area;
    … …  
    337336  Double_t excl_ymerge45 = 0.0;
    338337  Double_t excl_ymerge56 = 0.0;
    339 
     338 
    340339  DelphesFactory *factory = GetFactory();
    341340
    … …  
    382381  outputList.clear();
    383382
     383 
    384384  if(fExclusiveClustering)
    385385    {
    … …  
    405405  detaMax = 0.0;
    406406  dphiMax = 0.0;
    407 
     407 
    408408  for(itOutputList = outputList.begin(); itOutputList != outputList.end(); ++itOutputList)
    409409  {
    … …  
    416416    if(fAreaDefinition) area = itOutputList->area_4vector();
    417417
     418
     419   
    418420    candidate = factory->NewCandidate();
    419421
    … …  
    447449      charge += constituent->Charge;
    448450
    449       fConstituentsOutputArray->Add(constituent);
    450451      candidate->AddCandidate(constituent);
    451452    }
    … …  
    457458    candidate->DeltaEta = detaMax;
    458459    candidate->DeltaPhi = dphiMax;
    459     candidate->Charge = charge;
     460    candidate->Charge = charge; 
    460461    candidate->NNeutrals = nneutrals;
    461462    candidate->NCharged = ncharged;
    … …  
    467468    candidate->ExclYmerge45 = excl_ymerge45;
    468469    candidate->ExclYmerge56 = excl_ymerge56;
    469 
     470   
    470471    //------------------------------------
    471472    // Trimming
    … …  
    477478      fastjet::Filter    trimmer(fastjet::JetDefinition(fastjet::kt_algorithm,fRTrim),fastjet::SelectorPtFractionMin(fPtFracTrim));
    478479      fastjet::PseudoJet trimmed_jet = trimmer(*itOutputList);
    479 
     480     
    480481      trimmed_jet = join(trimmed_jet.constituents());
    481 
     482     
    482483      candidate->TrimmedP4[0].SetPtEtaPhiM(trimmed_jet.pt(), trimmed_jet.eta(), trimmed_jet.phi(), trimmed_jet.m());
    483 
    484       // four hardest subjets
     484       
     485      // four hardest subjets 
    485486      subjets.clear();
    486487      subjets = trimmed_jet.pieces();
    487488      subjets = sorted_by_pt(subjets);
    488 
     489     
    489490      candidate->NSubJetsTrimmed = subjets.size();
    490491
    491492      for (size_t i = 0; i < subjets.size() and i < 4; i++)
    492493      {
    493             if(subjets.at(i).pt() < 0) continue ;
     494            if(subjets.at(i).pt() < 0) continue ; 
    494495            candidate->TrimmedP4[i+1].SetPtEtaPhiM(subjets.at(i).pt(), subjets.at(i).eta(), subjets.at(i).phi(), subjets.at(i).m());
    495496      }
    496497    }
    497 
    498 
     498   
     499   
    499500    //------------------------------------
    500501    // Pruning
    501502    //------------------------------------
    502 
    503 
     503   
     504   
    504505    if(fComputePruning)
    505506    {
    … …  
    509510
    510511      candidate->PrunedP4[0].SetPtEtaPhiM(pruned_jet.pt(), pruned_jet.eta(), pruned_jet.phi(), pruned_jet.m());
    511 
    512       // four hardest subjet
     512         
     513      // four hardest subjet 
    513514      subjets.clear();
    514515      subjets = pruned_jet.pieces();
    515516      subjets = sorted_by_pt(subjets);
    516 
     517     
    517518      candidate->NSubJetsPruned = subjets.size();
    518519
    519520      for (size_t i = 0; i < subjets.size() and i < 4; i++)
    520521      {
    521             if(subjets.at(i).pt() < 0) continue ;
     522            if(subjets.at(i).pt() < 0) continue ; 
    522523            candidate->PrunedP4[i+1].SetPtEtaPhiM(subjets.at(i).pt(), subjets.at(i).eta(), subjets.at(i).phi(), subjets.at(i).m());
    523524      }
    524525
    525     }
    526 
     526    } 
     527     
    527528    //------------------------------------
    528529    // SoftDrop
    529530    //------------------------------------
    530 
     531   
    531532    if(fComputeSoftDrop)
    532533    {
    533 
     534   
    534535      contrib::SoftDrop softDrop(fBetaSoftDrop,fSymmetryCutSoftDrop,fR0SoftDrop);
    535536      fastjet::PseudoJet softdrop_jet = softDrop(*itOutputList);
    536 
     537     
    537538      candidate->SoftDroppedP4[0].SetPtEtaPhiM(softdrop_jet.pt(), softdrop_jet.eta(), softdrop_jet.phi(), softdrop_jet.m());
    538 
    539       // four hardest subjet
    540 
     539       
     540      // four hardest subjet 
     541     
    541542      subjets.clear();
    542543      subjets    = softdrop_jet.pieces();
    … …  
    548549      for (size_t i = 0; i < subjets.size()  and i < 4; i++)
    549550      {
    550             if(subjets.at(i).pt() < 0) continue ;
     551            if(subjets.at(i).pt() < 0) continue ; 
    551552            candidate->SoftDroppedP4[i+1].SetPtEtaPhiM(subjets.at(i).pt(), subjets.at(i).eta(), subjets.at(i).phi(), subjets.at(i).m());
    552553            if(i==0) candidate->SoftDroppedSubJet1 = candidate->SoftDroppedP4[i+1];
    … …  
    554555      }
    555556    }
    556 
     557 
    557558    // --- compute N-subjettiness with N = 1,2,3,4,5 ----
    558559
    559560    if(fComputeNsubjettiness)
    560561    {
    561 
     562     
    562563      Nsubjettiness nSub1(1, *fAxesDef, *fMeasureDef);
    563564      Nsubjettiness nSub2(2, *fAxesDef, *fMeasureDef);
    … …  
    565566      Nsubjettiness nSub4(4, *fAxesDef, *fMeasureDef);
    566567      Nsubjettiness nSub5(5, *fAxesDef, *fMeasureDef);
    567 
     568     
    568569      candidate->Tau[0] = nSub1(*itOutputList);
    569570      candidate->Tau[1] = nSub2(*itOutputList);
    … …  
    571572      candidate->Tau[3] = nSub4(*itOutputList);
    572573      candidate->Tau[4] = nSub5(*itOutputList);
    573 
     574         
    574575    }
    575576

  • modules/FastJetFinder.h

    r8a11cdc rdd64cff  
    4242    class NjettinessPlugin;
    4343    class ValenciaPlugin;
    44     class AxesDefinition;
    45     class MeasureDefinition;
     44    class AxesDefinition; 
     45    class MeasureDefinition;   
    4646  }
    4747}
    … …  
    6363  void *fRecomb; //!
    6464
    65   fastjet::contrib::AxesDefinition *fAxesDef;
    66   fastjet::contrib::MeasureDefinition *fMeasureDef;
     65  fastjet::contrib::AxesDefinition *fAxesDef; 
     66  fastjet::contrib::MeasureDefinition *fMeasureDef;   
    6767
    6868  fastjet::contrib::NjettinessPlugin *fNjettinessPlugin; //!
    … …  
    9090  //-- Valencia Linear Collider algorithm
    9191  Double_t fGamma;
    92 
     92 
    9393  //-- N (sub)jettiness parameters --
    9494
    … …  
    100100
    101101  //-- Trimming parameters --
    102 
     102 
    103103  Bool_t fComputeTrimming;
    104104  Double_t fRTrim;
    105105  Double_t fPtFracTrim;
    106 
     106 
    107107  //-- Pruning parameters --
    108108
    … …  
    152152  TObjArray *fOutputArray; //!
    153153  TObjArray *fRhoOutputArray; //!
    154   TObjArray *fConstituentsOutputArray; //!
    155154
    156155  ClassDef(FastJetFinder, 1)

  • modules/PdgCodeFilter.cc

    r8a11cdc rdd64cff  
    7676  fInvert = GetBool("Invert", false);
    7777
    78   // no pileup
    79   fRequireNotPileup = GetBool("RequireNotPileup", false);
    80 
    8178  fRequireStatus = GetBool("RequireStatus", false);
    8279  fStatus = GetInt("Status", 1);
    … …  
    130127    if(fRequireStatus && (candidate->Status != fStatus)) continue;
    131128    if(fRequireCharge && (candidate->Charge != fCharge)) continue;
    132     if(fRequireNotPileup && (candidate->IsPU   >0     )) continue;
    133129
    134130    pass = kTRUE;

  • modules/PdgCodeFilter.h

    r8a11cdc rdd64cff  
    5555  Bool_t fRequireCharge; //!
    5656  Int_t fCharge; //!
    57   Bool_t fRequireNotPileup; //!
     57
    5858
    5959  std::vector<Int_t> fPdgCodes;

  • modules/StatusPidFilter.cc

    r8a11cdc rdd64cff  
    153153{
    154154  // PT threshold
     155
    155156  fPTMin = GetDouble("PTMin", 0.5);
    156 
    157   // keep or remove pileup particles
    158   fRequireNotPileup = GetBool("RequireNotPileup", false);
    159157
    160158  // import input array
    … …  
    229227    if(!pass || (candidate->Momentum.Pt() < fPTMin && !(is_b_hadron || is_b_quark || is_tau_daughter || is_W_daughter)) ) continue;
    230228
    231     // not pileup particles
    232     if(fRequireNotPileup && (candidate->IsPU >0)) continue;
    233 
    234229    fOutputArray->Add(candidate);
    235230  }

  • modules/StatusPidFilter.h

    r8a11cdc rdd64cff  
    5151  Double_t fPTMin; //!
    5252
    53   Bool_t fRequireNotPileup; //!
    54 
    5553  TIterator *fItInputArray; //!
    5654

  • modules/UniqueObjectFinder.cc

    r8a11cdc rdd64cff  
    6767void UniqueObjectFinder::Init()
    6868{
    69   // use GetUniqueID algorithm to find unique objects (faster than the default Overlaps method)
    70   fUseUniqueID = GetBool("UseUniqueID", false);
    71 
    7269  // import arrays with output from other modules
    7370
    … …  
    149146    while((previousCandidate = static_cast<Candidate*>(iterator.Next())))
    150147    {
    151       if(fUseUniqueID)
     148      if(candidate->Overlaps(previousCandidate))
    152149      {
    153         if(candidate->GetUniqueID() == previousCandidate->GetUniqueID())
    154         {
    155           return kFALSE;
    156         }
    157       }
    158       else
    159       {
    160         if(candidate->Overlaps(previousCandidate))
    161         {
    162           return kFALSE;
    163         }
     150        return kFALSE;
    164151      }
    165152    }

  • modules/UniqueObjectFinder.h

    r8a11cdc rdd64cff  
    5050private:
    5151
    52   Bool_t fUseUniqueID;
    53 
    5452  Bool_t Unique(Candidate *candidate, std::vector< std::pair< TIterator *, TObjArray * > >::iterator itInputMap);
    5553

  • readers/DelphesProMC.cpp

    r8a11cdc rdd64cff  
    125125    candidate->Status = status;
    126126
    127     candidate->IsPU=0;
    128     if (mutableParticles->barcode(i)>0) candidate->IsPU=1; // pileup particle
    129 
    130127    candidate->M1 = mutableParticles->mother1(i);
    131128    candidate->M2 = mutableParticles->mother2(i);
    … …  
    234231      cout << "** Reading " << argv[i] << endl;
    235232
    236       // use 64 bit
    237       //inputFile = new ProMCBook(argv[i], "r", true);
    238 
    239       //use 32 bit zip (faster but limitted to 64k events)
    240233      inputFile = new ProMCBook(argv[i], "r");
    241234
Note: See TracChangeset for help on using the changeset viewer.