Changeset e4c3fef in git for modules/FastJetFinder.cc

Timestamp:

Apr 17, 2014, 10:54:17 AM (11 years ago)

Author:

pavel <pavel@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

b96d99b

Parents:

2e6a81b

Message:

several minor corrections

File:

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

modules/FastJetFinder.cc

@@ -47 +47 @@
 #include "fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh"
 
-#include "fastjet/contribs/Nsubjettiness/Nsubjettiness.hh" 
+#include "fastjet/contribs/Nsubjettiness/Nsubjettiness.hh"
 #include "fastjet/contribs/Nsubjettiness/Njettiness.hh"
 #include "fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh"
@@ -76 +76 @@
 void FastJetFinder::Init()
 {
-  
+
   JetDefinition::Plugin *plugin = NULL;
   JetDefinition::Recombiner *recomb = NULL;
   NjettinessPlugin *njet_plugin = NULL;
-  
+
   // read eta ranges
 
@@ -110 +110 @@
 
   //-- N(sub)jettiness parameters --
-  
+
   fComputeNsubjettiness = GetBool("ComputeNsubjettiness", false);
   fBeta = GetDouble("Beta", 1.0);
   fAxisMode = GetInt("AxisMode", 1);
-  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)
-  
+  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)
+
   // ---  Jet Area Parameters ---
   fAreaAlgorithm = GetInt("AreaAlgorithm", 0);
   fComputeRho = GetBool("ComputeRho", false);
-  
+
   // - ghost based areas -
   fGhostEtaMax = GetDouble("GhostEtaMax", 5.0);
@@ -128 +128 @@
   fPtScatter = GetDouble("PtScatter", 0.1);
   fMeanGhostPt = GetDouble("MeanGhostPt", 1.0E-100);
-  
+
   // - voronoi based areas -
   fEffectiveRfact = GetDouble("EffectiveRfact", 1.0);
@@ -188 +188 @@
       break;
   }
- 
 
   fPlugin = plugin;
   fRecomb = recomb;
   fNjettinessPlugin = njet_plugin;
-  
+
   ClusterSequence::print_banner();
 
@@ -299 +298 @@
     inputList.clear();
     inputList = sequence->constituents(*itOutputList);
-      
+
     for(itInputList = inputList.begin(); itInputList != inputList.end(); ++itInputList)
     {
@@ -308 +307 @@
       if(deta > detaMax) detaMax = deta;
       if(dphi > dphiMax) dphiMax = dphi;
-      
+
       time += TMath::Sqrt(constituent->Momentum.E())*(constituent->Position.T());
       weightTime += TMath::Sqrt(constituent->Momentum.E());
-    
+
       candidate->AddCandidate(constituent);
     }
-   
+
     avTime = time/weightTime;
 
@@ -325 +324 @@
 
     // --- compute N-subjettiness with N = 1,2,3,4,5 ----
-    
+
     if(fComputeNsubjettiness)
     {
       Njettiness::AxesMode axisMode;
-     
-      if (fAxisMode == 1) axisMode = Njettiness::wta_kt_axes;
-      if (fAxisMode == 2) axisMode = Njettiness::onepass_wta_kt_axes;
-      if (fAxisMode == 3) axisMode = Njettiness::kt_axes;
-      if (fAxisMode == 4) axisMode = Njettiness::onepass_kt_axes;
-       
+
+      switch(fAxisMode)
+      {
+        default:
+        case 1:
+          axisMode = Njettiness::wta_kt_axes;
+          break;
+        case 2:
+          axisMode = Njettiness::onepass_wta_kt_axes;
+          break;
+        case 3:
+          axisMode = Njettiness::kt_axes;
+          break;
+        case 4:
+          axisMode = Njettiness::onepass_kt_axes;
+          break;
+      }
+
       Njettiness::MeasureMode measureMode = Njettiness::unnormalized_measure;
-      
+
       Nsubjettiness nSub1(1, axisMode, measureMode, fBeta);
       Nsubjettiness nSub2(2, axisMode, measureMode, fBeta);
-      Nsubjettiness nSub3(3, axisMode, measureMode, fBeta); 
-      Nsubjettiness nSub4(4, axisMode, measureMode, fBeta); 
-      Nsubjettiness nSub5(5, axisMode, measureMode, fBeta); 
-    
-      candidate -> Tau1 = nSub1(*itOutputList);
-      candidate -> Tau2 = nSub2(*itOutputList);
-      candidate -> Tau3 = nSub3(*itOutputList);
-      candidate -> Tau4 = nSub4(*itOutputList);
-      candidate -> Tau5 = nSub5(*itOutputList);
+      Nsubjettiness nSub3(3, axisMode, measureMode, fBeta);
+      Nsubjettiness nSub4(4, axisMode, measureMode, fBeta);
+      Nsubjettiness nSub5(5, axisMode, measureMode, fBeta);
+
+      candidate->Tau[0] = nSub1(*itOutputList);
+      candidate->Tau[1] = nSub2(*itOutputList);
+      candidate->Tau[2] = nSub3(*itOutputList);
+      candidate->Tau[3] = nSub4(*itOutputList);
+      candidate->Tau[4] = nSub5(*itOutputList);
     }