Changes in / [5a69ba1d:1f7223c] in git

Files:

• Makefile (modified) (2 diffs)
• cards/delphes_card_CLICdet.tcl (deleted)
• classes/DelphesClasses.cc (modified) (1 diff)
• classes/DelphesClasses.h (modified) (2 diffs)
• modules/FastJetFinder.cc (modified) (5 diffs)
• modules/TreeWriter.cc (modified) (1 diff)

Makefile

@@ -1754 +1754 @@
         external/fastjet/internal/numconsts.hh \
         external/fastjet/PseudoJet.hh \
-        external/fastjet/internal/deprecated.hh
+        external/fastjet/internal/deprecated.hh \
+        external/fastjet/ClusterSequence.hh
         @touch $@
 
@@ -1900 +1901 @@
 
 external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
-        external/fastjet/ClusterSequence.hh \
-        external/fastjet/JetDefinition.hh
+        external/fastjet/JetDefinition.hh \
+        external/fastjet/ClusterSequence.hh
         @touch $@
 

classes/DelphesClasses.cc

@@ -157 +157 @@
   NSubJetsPruned(0),
   NSubJetsSoftDropped(0),
-  ExclYmerge23(0),
-  ExclYmerge34(0),
-  ExclYmerge45(0),
-  ExclYmerge56(0),
   fFactory(0),
   fArray(0)

classes/DelphesClasses.h

@@ -396 +396 @@
   TLorentzVector SoftDroppedP4[5]; // first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
 
-
   Int_t NSubJetsTrimmed; // number of subjets trimmed
   Int_t NSubJetsPruned; // number of subjets pruned
   Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
 
-  Double_t ExclYmerge23;
-  Double_t ExclYmerge34;
-  Double_t ExclYmerge45;
-  Double_t ExclYmerge56;
-  
   TRefArray Constituents; // references to constituents
   TRefArray Particles; // references to generated particles
@@ -647 +641 @@
   Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
 
-  // Exclusive clustering variables
-  Double_t ExclYmerge23;
-  Double_t ExclYmerge34;
-  Double_t ExclYmerge45;
-  Double_t ExclYmerge56;
-      
+
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }

modules/FastJetFinder.cc

@@ -80 +80 @@
 
 FastJetFinder::FastJetFinder() :
-  fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), fValenciaPlugin(0),
-  fDefinition(0), fAreaDefinition(0), fItInputArray(0)
+  fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), 
+  fDefinition(0), fAreaDefinition(0), fItInputArray(0), fValenciaPlugin(0)
 {
 
@@ -332 +332 @@
   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();
 
@@ -381 +377 @@
   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
@@ -410 +400 @@
     if(fAreaDefinition) area = itOutputList->area_4vector();
 
-
-    
     candidate = factory->NewCandidate();
 
@@ -455 +443 @@
     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;
     
     //------------------------------------

modules/TreeWriter.cc

@@ -695 +695 @@
     }
 
-    //--- exclusive clustering variables ---
-    entry->ExclYmerge23 = candidate->ExclYmerge23;
-    entry->ExclYmerge34 = candidate->ExclYmerge34;
-    entry->ExclYmerge45 = candidate->ExclYmerge45;
-    entry->ExclYmerge56 = candidate->ExclYmerge56;    
-
-
     FillParticles(candidate, &entry->Particles);
   }