Changes in modules/FastJetFinder.cc [e9c0d73:ba75867] in git

File:

• modules/FastJetFinder.cc (modified) (11 diffs)

modules/FastJetFinder.cc

@@ -66 +66 @@
 #include "fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh"
 
-#include "fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh"
-
 #include "fastjet/tools/Filter.hh"
 #include "fastjet/tools/Pruner.hh"
@@ -80 +78 @@
 
 FastJetFinder::FastJetFinder() :
-  fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), fValenciaPlugin(0),
+  fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), 
   fDefinition(0), fAreaDefinition(0), fItInputArray(0)
 {
@@ -120 +118 @@
   fJetPTMin = GetDouble("JetPTMin", 10.0);
 
- 
   //-- N(sub)jettiness parameters --
 
@@ -128 +125 @@
   fRcutOff = GetDouble("RcutOff", 0.8); // used only if Njettiness is used as jet clustering algo (case 8)
   fN = GetInt("N", 2);                  // used only if Njettiness is used as jet clustering algo (case 8)
-
-  //-- Exclusive clustering for e+e- collisions --
-  
-  fNJets = GetInt("NJets",2);
-  fExclusiveClustering = GetBool("ExclusiveClustering", false);
-
-  //-- Valencia Linear Collider algorithm
-  fGamma = GetDouble("Gamma", 1.0);
-  //fBeta parameter see above
-  
+     
   fMeasureDef = new NormalizedMeasure(fBeta, fParameterR);
    
@@ -248 +236 @@
       fDefinition = new JetDefinition(fNjettinessPlugin);
       break;
-  case 9:
-      fValenciaPlugin = new ValenciaPlugin(fParameterR, fBeta, fGamma);
-      fDefinition = new JetDefinition(fValenciaPlugin);
-      break;
-
   }
 
@@ -311 +294 @@
   if(fAxesDef) delete fAxesDef;
   if(fMeasureDef) delete fMeasureDef;
-  if(fValenciaPlugin) delete static_cast<JetDefinition::Plugin*>(fValenciaPlugin);
-
 }
 
@@ -332 +313 @@
   vector< PseudoJet >::iterator itInputList, itOutputList;
   vector< TEstimatorStruct >::iterator itEstimators;
-  Double_t excl_ymerge23 = 0.0;
-  Double_t excl_ymerge34 = 0.0;
-  Double_t excl_ymerge45 = 0.0;
-  Double_t excl_ymerge56 = 0.0;
-  
+
   DelphesFactory *factory = GetFactory();
 
@@ -380 +357 @@
 
   outputList.clear();
-
-  
-  if(fExclusiveClustering)
-    {
-      outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
-
-      excl_ymerge23 = sequence->exclusive_ymerge( 2 );
-      excl_ymerge34 = sequence->exclusive_ymerge( 3 );
-      excl_ymerge45 = sequence->exclusive_ymerge( 4 );
-      excl_ymerge56 = sequence->exclusive_ymerge( 5 );
-    }
-  else
-    {
-      outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin));
-    }
+  outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin));
+
 
   // loop over all jets and export them
@@ -410 +374 @@
     if(fAreaDefinition) area = itOutputList->area_4vector();
 
-
-    
     candidate = factory->NewCandidate();
 
@@ -455 +417 @@
     candidate->NNeutrals = nneutrals;
     candidate->NCharged = ncharged;
-
-
-    //for exclusive clustering, access y_n,n+1 as exclusive_ymerge (fNJets);
-    candidate->ExclYmerge23 = excl_ymerge23;
-    candidate->ExclYmerge34 = excl_ymerge34;
-    candidate->ExclYmerge45 = excl_ymerge45;
-    candidate->ExclYmerge56 = excl_ymerge56;
     
     //------------------------------------
@@ -539 +494 @@
       candidate->NSubJetsSoftDropped = softdrop_jet.pieces().size();
 
+      candidate->SoftDroppedJet = candidate->SoftDroppedP4[0];
+
       for (size_t i = 0; i < subjets.size()  and i < 4; i++)
       {
             if(subjets.at(i).pt() < 0) continue ; 
             candidate->SoftDroppedP4[i+1].SetPtEtaPhiM(subjets.at(i).pt(), subjets.at(i).eta(), subjets.at(i).phi(), subjets.at(i).m());
+            if(i==0) candidate->SoftDroppedSubJet1 = candidate->SoftDroppedP4[i+1];
+            if(i==1) candidate->SoftDroppedSubJet2 = candidate->SoftDroppedP4[i+1];
       }
     }