Changeset 94 in svn for trunk/src/JetUtils.cc

Timestamp:

Dec 12, 2008, 5:32:29 PM (16 years ago)

Author:

severine ovyn

Message:

Add frog plus cleaning + bugs remove

File:

• trunk/src/JetUtils.cc (modified) (8 diffs)

trunk/src/JetUtils.cc

@@ -17 +17 @@
 JetsUtil::JetsUtil() {
   
-  switch(JETALGO) {
+  switch(JET_jetalgo) {
   default:
   case 1: {
@@ -23 +23 @@
     // set up a CDF midpoint jet definition
 #ifdef ENABLE_PLUGIN_CDFCONES
-    plugins = new fastjet::CDFJetCluPlugin(SEEDTHRESHOLD,CONERADIUS,C_ADJACENCYCUT,C_MAXITERATIONS,C_IRATCH,OVERLAPTHRESHOLD);
+    plugins = new fastjet::CDFJetCluPlugin(JET_seed,JET_coneradius,JET_C_adjacencycut,JET_C_maxiterations,JET_C_iratch,JET_overlap);
     jet_def = fastjet::JetDefinition(plugins);
 #else
@@ -34 +34 @@
     // set up a CDF midpoint jet definition
 #ifdef ENABLE_PLUGIN_CDFCONES
-    plugins = new fastjet::CDFMidPointPlugin (SEEDTHRESHOLD,CONERADIUS,M_CONEAREAFRACTION,M_MAXPAIRSIZE,M_MAXITERATIONS,OVERLAPTHRESHOLD);
+    plugins = new fastjet::CDFMidPointPlugin (JET_seed,JET_coneradius,JET_M_coneareafraction,JET_M_maxpairsize,JET_M_maxiterations,JET_overlap);
     jet_def = fastjet::JetDefinition(plugins);
 #else
@@ -45 +45 @@
     // set up a siscone jet definition
 #ifdef ENABLE_PLUGIN_SISCONE
-    plugins = new fastjet::SISConePlugin (CONERADIUS,OVERLAPTHRESHOLD,NPASS, PROTOJET_PTMIN);
+    plugins = new fastjet::SISConePlugin (JET_coneradius,JET_overlap,JET_S_npass, JET_S_protojet_ptmin);
     jet_def = fastjet::JetDefinition(plugins);
 #else
@@ -54 +54 @@
     
   case 4: {
-    jet_def = fastjet::JetDefinition(fastjet::kt_algorithm, CONERADIUS);
+    jet_def = fastjet::JetDefinition(fastjet::kt_algorithm, JET_coneradius);
   }
     break;
     
   case 5: {
-    jet_def = fastjet::JetDefinition(fastjet::cambridge_algorithm,CONERADIUS);
+    jet_def = fastjet::JetDefinition(fastjet::cambridge_algorithm,JET_coneradius);
   }
     break;
     
   case 6: {
-    jet_def = fastjet::JetDefinition(fastjet::antikt_algorithm,CONERADIUS);
+    jet_def = fastjet::JetDefinition(fastjet::antikt_algorithm,JET_coneradius);
   }
     break;
@@ -96 +96 @@
   for (unsigned int i = 0; i < sorted_jets.size(); i++) {
     JET.SetPxPyPzE(sorted_jets[i].px(),sorted_jets[i].py(),sorted_jets[i].pz(),sorted_jets[i].E());
-    if(JET.Pt() > JET_pt)
+    if(JET.Pt() > PTCUT_jet)
       {
         elementJet = (TRootJet*) branchJet->NewEntry();
@@ -102 +102 @@
         // b-jets
         bool btag=false;
-        if((fabs(JET.Eta()) < MAX_TRACKER && Btaggedjet(JET, NFCentralQ)))btag=true;
+        if((fabs(JET.Eta()) < CEN_max_tracker && Btaggedjet(JET, NFCentralQ)))btag=true;
         elementJet->Btag = btag;
       }
@@ -116 +116 @@
     JET.SetPxPyPzE(sorted_jets[i].px(),sorted_jets[i].py(),sorted_jets[i].pz(),sorted_jets[i].E());
     // Tau jet identification : 1! track and electromagnetic collimation
-    if(fabs(JET.Eta()) < (MAX_TRACKER - TAU_CONE_TRACKS)) {
+    if(fabs(JET.Eta()) < (CEN_max_tracker - TAU_track_scone)) {
       double Energie_tau_central = EnergySmallCone(towers,JET.Eta(),JET.Phi());
       if(
-         ( Energie_tau_central/JET.E() > TAU_EM_COLLIMATION ) &&
-         ( NumTracks(TrackCentral,PT_TRACK_TAU,JET.Eta(),JET.Phi()) == 1 ) &&
-         ( JET.Pt() > TAUJET_pt)
+         ( Energie_tau_central/JET.E() > TAU_energy_frac ) &&
+         ( NumTracks(TrackCentral,TAU_track_pt,JET.Eta(),JET.Phi()) == 1 ) &&
+         ( JET.Pt() > PTCUT_taujet)
          ) {
         elementTauJet = (TRootTauJet*) branchTauJet->NewEntry();