Changeset 1383 in svn for trunk

Timestamp:

Apr 17, 2014, 12:28:09 PM (11 years ago)

Author:

Pavel Demin

Message:

fix namespace usage

Location:

trunk/modules

Files:

• FastJetFinder.cc (modified) (5 diffs)
• FastJetFinder.h (modified) (2 diffs)

trunk/modules/FastJetFinder.cc

@@ -60 +60 @@
 
 FastJetFinder::FastJetFinder() :
-  fPlugin(0), fDefinition(0), fAreaDefinition(0), fItInputArray(0), fRecomb(0), fNjettinessPlugin(0)
+  fPlugin(0), fRecomb(0), fNjettinessPlugin(0), fDefinition(0), fAreaDefinition(0), fItInputArray(0)
 {
 
@@ -76 +76 @@
 void FastJetFinder::Init()
 {
-
-  JetDefinition::Plugin *plugin = NULL;
-  JetDefinition::Recombiner *recomb = NULL;
-  NjettinessPlugin *njet_plugin = NULL;
+  JetDefinition::Plugin *plugin = 0;
+  JetDefinition::Recombiner *recomb = 0;
+  NjettinessPlugin *njetPlugin = 0;
 
   // read eta ranges
@@ -135 +134 @@
   {
     case 1:
-      fAreaDefinition = new fastjet::AreaDefinition(active_area_explicit_ghosts, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
+      fAreaDefinition = new AreaDefinition(active_area_explicit_ghosts, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
       break;
     case 2:
-      fAreaDefinition = new fastjet::AreaDefinition(one_ghost_passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
+      fAreaDefinition = new AreaDefinition(one_ghost_passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
       break;
     case 3:
-      fAreaDefinition = new fastjet::AreaDefinition(passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
+      fAreaDefinition = new AreaDefinition(passive_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
       break;
     case 4:
-      fAreaDefinition = new fastjet::AreaDefinition(VoronoiAreaSpec(fEffectiveRfact));
+      fAreaDefinition = new AreaDefinition(VoronoiAreaSpec(fEffectiveRfact));
       break;
     case 5:
-      fAreaDefinition = new fastjet::AreaDefinition(active_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
+      fAreaDefinition = new AreaDefinition(active_area, GhostedAreaSpec(fGhostEtaMax, fRepeat, fGhostArea, fGridScatter, fPtScatter, fMeanGhostPt));
       break;
     default:
@@ -158 +157 @@
   {
     case 1:
-      plugin = new fastjet::CDFJetCluPlugin(fSeedThreshold, fConeRadius, fAdjacencyCut, fMaxIterations, fIratch, fOverlapThreshold);
-      fDefinition = new fastjet::JetDefinition(plugin);
+      plugin = new CDFJetCluPlugin(fSeedThreshold, fConeRadius, fAdjacencyCut, fMaxIterations, fIratch, fOverlapThreshold);
+      fDefinition = new JetDefinition(plugin);
       break;
     case 2:
-      plugin = new fastjet::CDFMidPointPlugin(fSeedThreshold, fConeRadius, fConeAreaFraction, fMaxPairSize, fMaxIterations, fOverlapThreshold);
-      fDefinition = new fastjet::JetDefinition(plugin);
+      plugin = new CDFMidPointPlugin(fSeedThreshold, fConeRadius, fConeAreaFraction, fMaxPairSize, fMaxIterations, fOverlapThreshold);
+      fDefinition = new JetDefinition(plugin);
       break;
     case 3:
-      plugin = new fastjet::SISConePlugin(fConeRadius, fOverlapThreshold, fMaxIterations, fJetPTMin);
-      fDefinition = new fastjet::JetDefinition(plugin);
+      plugin = new SISConePlugin(fConeRadius, fOverlapThreshold, fMaxIterations, fJetPTMin);
+      fDefinition = new JetDefinition(plugin);
       break;
     case 4:
-      fDefinition = new fastjet::JetDefinition(fastjet::kt_algorithm, fParameterR);
+      fDefinition = new JetDefinition(kt_algorithm, fParameterR);
       break;
     case 5:
-      fDefinition = new fastjet::JetDefinition(fastjet::cambridge_algorithm, fParameterR);
+      fDefinition = new JetDefinition(cambridge_algorithm, fParameterR);
       break;
     default:
     case 6:
-      fDefinition = new fastjet::JetDefinition(fastjet::antikt_algorithm, fParameterR);
+      fDefinition = new JetDefinition(antikt_algorithm, fParameterR);
       break;
     case 7:
-      recomb = new fastjet::contrib::WinnerTakeAllRecombiner();
-      fDefinition = new fastjet::JetDefinition(fastjet::antikt_algorithm, fParameterR, recomb, Best);
+      recomb = new WinnerTakeAllRecombiner();
+      fDefinition = new JetDefinition(antikt_algorithm, fParameterR, recomb, Best);
       break;
     case 8:
-      njet_plugin = new fastjet::contrib::NjettinessPlugin(fN, Njettiness::wta_kt_axes, Njettiness::unnormalized_cutoff_measure, fBeta, fRcutOff);
-      fDefinition = new fastjet::JetDefinition(njet_plugin);
+      njetPlugin = new NjettinessPlugin(fN, Njettiness::wta_kt_axes, Njettiness::unnormalized_cutoff_measure, fBeta, fRcutOff);
+      fDefinition = new JetDefinition(njetPlugin);
       break;
   }
@@ -191 +190 @@
   fPlugin = plugin;
   fRecomb = recomb;
-  fNjettinessPlugin = njet_plugin;
+  fNjettinessPlugin = njetPlugin;
 
   ClusterSequence::print_banner();

trunk/modules/FastJetFinder.h

@@ -25 +25 @@
   class AreaDefinition;
   class Selector;
+  namespace contrib {
+    class NjettinessPlugin;
+  }
 }
 
@@ -42 +45 @@
   void *fPlugin; //!
   void *fRecomb; //!
-  void *fNjettinessPlugin; //!
+  fastjet::contrib::NjettinessPlugin *fNjettinessPlugin; //!
 
   fastjet::JetDefinition *fDefinition; //!