Changes in / [8269ee2:5107603] in git

Files:

• Makefile (modified) (5 diffs)
• external/fastjet/contribs/ValenciaPlugin/AUTHORS (deleted)
• external/fastjet/contribs/ValenciaPlugin/COPYING (deleted)
• external/fastjet/contribs/ValenciaPlugin/ChangeLog (deleted)
• external/fastjet/contribs/ValenciaPlugin/Makefile (deleted)
• external/fastjet/contribs/ValenciaPlugin/NEWS (deleted)
• external/fastjet/contribs/ValenciaPlugin/README (deleted)
• external/fastjet/contribs/ValenciaPlugin/VERSION (deleted)
• external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.cc (deleted)
• external/fastjet/contribs/ValenciaPlugin/ValenciaPlugin.hh (deleted)
• 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)
@@ -1419 +1417 @@
         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 \
@@ -1447 +1444 @@
         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 \
@@ -1505 +1501 @@
         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) \
@@ -1899 +1894 @@
         @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"
@@ -81 +79 @@
 FastJetFinder::FastJetFinder() :
   fPlugin(0), fRecomb(0), fAxesDef(0), fMeasureDef(0), fNjettinessPlugin(0), 
-  fDefinition(0), fAreaDefinition(0), fItInputArray(0), fValenciaPlugin(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);
-
 }
 
@@ -376 +357 @@
 
   outputList.clear();
-
-  if(fExclusiveClustering)
-    {
-      outputList = sorted_by_pt(sequence->exclusive_jets( fNJets ));
-    }
-  else
-    {
-      outputList = sorted_by_pt(sequence->inclusive_jets(fJetPTMin));
-    }
+  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;    
@@ -62 +61 @@
   void *fPlugin; //!
   void *fRecomb; //!
+  fastjet::contrib::NjettinessPlugin *fNjettinessPlugin; //!
 
-  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;
@@ -83 +77 @@
   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;