Changeset 8269ee2 in git

Timestamp:

Nov 29, 2017, 8:04:09 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

1d2d44b, dda357d

Parents:

5107603 (diff), 67b86c2 (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.

git-author:

Michele Selvaggi <michele.selvaggi@…> (11/29/17 20:04:09)

git-committer:

GitHub <noreply@…> (11/29/17 20:04:09)

Message:

Merge pull request #45 from uschnoor/VLC_jetclustering

Thanks!

Files:

• Makefile (modified) (5 diffs)
• external/fastjet/contribs/ValenciaPlugin/AUTHORS (added)
• external/fastjet/contribs/ValenciaPlugin/COPYING (added)
• external/fastjet/contribs/ValenciaPlugin/ChangeLog (added)
• external/fastjet/contribs/ValenciaPlugin/Makefile (added)
• external/fastjet/contribs/ValenciaPlugin/NEWS (added)
• external/fastjet/contribs/ValenciaPlugin/README (added)
• external/fastjet/contribs/ValenciaPlugin/VERSION (added)
• external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.cc (added)
• external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh (added)
• modules/FastJetFinder.cc (modified) (7 diffs)
• modules/FastJetFinder.h (modified) (3 diffs)

Makefile

@@ -1257 +1257 @@
         external/fastjet/Voronoi.$(SrcSuf) \
         external/fastjet/internal/Voronoi.hh
+tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf): \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf)
 tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf): \
         external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(SrcSuf)
@@ -1417 +1419 @@
         external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
         external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
         external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
         external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
@@ -1444 +1447 @@
         external/fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh \
         external/fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh \
+        external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh \
         external/fastjet/contribs/Nsubjettiness/Nsubjettiness.hh \
         external/fastjet/contribs/Nsubjettiness/Njettiness.hh \
@@ -1501 +1505 @@
         tmp/external/fastjet/TilingExtent.$(ObjSuf) \
         tmp/external/fastjet/Voronoi.$(ObjSuf) \
+        tmp/external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/AxesDefinition.$(ObjSuf) \
         tmp/external/fastjet/contribs/Nsubjettiness/ExtraRecombiners.$(ObjSuf) \
@@ -1894 +1899 @@
         @touch $@
 
+
+external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh: \
+        external/fastjet/JetDefinition.hh \
+        external/fastjet/ClusterSequence.hh
+        @touch $@
+
 external/fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh: \
         external/fastjet/ClusterSequence.hh \

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"
@@ -79 +81 @@
 FastJetFinder::FastJetFinder() :
   fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), 
-  fDefinition(0), fAreaDefinition(0), fItInputArray(0)
+  fDefinition(0), fAreaDefinition(0), fItInputArray(0), fValenciaPlugin(0)
 {
 
@@ -118 +120 @@
   fJetPTMin = GetDouble("JetPTMin", 10.0);
 
+ 
   //-- N(sub)jettiness parameters --
 
@@ -125 +128 @@
   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);
    
@@ -236 +248 @@
       fDefinition = new JetDefinition(fNjettinessPlugin);
       break;
+  case 9:
+      fValenciaPlugin = new ValenciaPlugin(fParameterR, fBeta, fGamma);
+      fDefinition = new JetDefinition(fValenciaPlugin);
+      break;
+
   }
 
@@ -294 +311 @@
   if(fAxesDef) delete fAxesDef;
   if(fMeasureDef) delete fMeasureDef;
+  if(fValenciaPlugin) delete static_cast<JetDefinition::Plugin*>(fValenciaPlugin);
+
 }
 
@@ -357 +376 @@
 
   outputList.clear();
-  outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin));
-
+
+  if(fExclusiveClustering)
+    {
+      outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
+    }
+  else
+    {
+      outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin));
+    }
 
   // loop over all jets and export them

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;