Changeset 6965fe1 in git for modules/FastJetFinder.h

Timestamp:

Dec 5, 2017, 8:33:29 PM (7 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8d4d51b

Parents:

ba75867 (diff), dda357d (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' of github.com:delphes/delphes

File:

• modules/FastJetFinder.h (modified) (3 diffs)

modules/FastJetFinder.h

@@ -41 +41 @@
   namespace contrib {
     class NjettinessPlugin;
+    class ValenciaPlugin;
     class AxesDefinition; 
     class MeasureDefinition;    
@@ -61 +62 @@
   void *fPlugin; //!
   void *fRecomb; //!
+
+  fastjet::contrib::AxesDefinition *fAxesDef; 
+  fastjet::contrib::MeasureDefinition *fMeasureDef;    
+
   fastjet::contrib::NjettinessPlugin *fNjettinessPlugin; //!
-
+  fastjet::contrib::ValenciaPlugin *fValenciaPlugin; //!
   fastjet::JetDefinition *fDefinition; //!
 
   Int_t fJetAlgorithm;
   Double_t fParameterR;
+
   Double_t fJetPTMin;
   Double_t fConeRadius;
@@ -77 +83 @@
   Double_t fOverlapThreshold;
 
+  //-- Exclusive clustering for e+e- collisions --
+
+  Int_t fNJets;
+  Bool_t fExclusiveClustering;
+
+  //-- Valencia Linear Collider algorithm
+  Double_t fGamma;
+  
   //-- N (sub)jettiness parameters --
 
   Bool_t fComputeNsubjettiness;
-  fastjet::contrib::AxesDefinition *fAxesDef; 
-  fastjet::contrib::MeasureDefinition *fMeasureDef;    
   Double_t fBeta;
   Int_t fAxisMode;