Changeset 9ad08ca in git

Timestamp:

Jun 21, 2016, 4:09:24 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d97b2af

Parents:

332025f (diff), c008923 (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:

Merge branch 'master' into dev_01

Files:

• cards/CMS_PhaseII/CMS_PhaseII_0PU_noHGCAL.tcl (added)
• cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl (modified) (1 diff)
• cards/CMS_PhaseII/CMS_PhaseII_200PU_noHGCAL.tcl (added)
• external/PUPPI/PuppiAlgo.cc (modified) (2 diffs)
• readers/DelphesPythia8.cpp (modified) (3 diffs)

cards/CMS_PhaseII/CMS_PhaseII_200PU.tcl

@@ -98 +98 @@
 
   # pre-generated minbias input file
-  #set PileUpFile ../eos/cms/store/group/upgrade/delphes/PhaseII/MinBias_100k.pileup
-  set PileUpFile MinBias.pileup
-
+  set PileUpFile ../eos/cms/store/group/upgrade/delphes/PhaseII/MinBias_100k.pileup
+  
   # average expected pile up
   set MeanPileUp 200

external/PUPPI/PuppiAlgo.cc

@@ -19 +19 @@
   std::vector<AlgoSubObj> lAlgos = iAlgo.subAlgos;
   fNAlgos = lAlgos.size();
-  std::cout << "==> "  << fEtaMin << " - " << fEtaMax << " - " << fPtMin  << " - " << fNeutralPtMin  << " - " << fNeutralPtSlope  << " - " << fRMSEtaSF  << " - " << std::endl;
+  //std::cout << "==> "  << fEtaMin << " - " << fEtaMax << " - " << fPtMin  << " - " << fNeutralPtMin  << " - " << fNeutralPtSlope  << " - " << fRMSEtaSF  << " - " << std::endl;
   for(unsigned int i0 = 0; i0 < lAlgos.size(); i0++)  { 
     int    pAlgoId      = lAlgos[i0].metricId;
@@ -28 +28 @@
     double pRMSPtMin    = lAlgos[i0].rmsPtMin;
     double pRMSSF       = lAlgos[i0].rmsScaleFactor;
-    std::cout << "Algo==> " << i0 << " - " << pAlgoId << " - " << pCharged << " - " << pWeight0 << " - " << pComb << " - " << pConeSize << " - " << pRMSPtMin << " - " << std::endl;
+    //std::cout << "Algo==> " << i0 << " - " << pAlgoId << " - " << pCharged << " - " << pWeight0 << " - " << pComb << " - " << pConeSize << " - " << pRMSPtMin << " - " << std::endl;
     fAlgoId        .push_back(pAlgoId);
     fCharged       .push_back(pCharged);

readers/DelphesPythia8.cpp

@@ -25 +25 @@
 
 #include "Pythia.h"
+#include "Pythia8Plugins/CombineMatchingInput.h"
 
 #include "TROOT.h"
@@ -224 +225 @@
 
   Pythia8::Pythia *pythia = 0;
+ 
+  // for matching
+  Pythia8::CombineMatchingInput *combined = 0;
+  Pythia8::UserHooks* matching = 0;
 
   if(argc != 4)
@@ -270 +275 @@
     // Initialize Pythia
     pythia = new Pythia8::Pythia;
-    //Pythia8::Event& event = pythia->event;
-    //Pythia8::ParticleData& pdt = pythia->particleData;
+  
+    // jet matching
+    matching = combined->getHook(*pythia);
+    if (!matching)
+    {
+      throw runtime_error("can't do matching");
+    }
+    pythia->setUserHooksPtr(matching);
+ 
 
     if(pythia == NULL)