Changeset 43 in svn for trunk/src

Timestamp:

Nov 19, 2008, 2:06:15 PM (16 years ago)

Author:

severine ovyn

Message:

general jet variable

File:

• trunk/src/SmearUtil.cc (modified) (3 diffs)

trunk/src/SmearUtil.cc

@@ -80 +80 @@
 CONERADIUS   = 0.7;     // generic jet radius ; not for tau's !!!
 JETALGO      =   1;     // 1 for Cone algorithm, 2 for MidPoint algorithm, 3 for SIScone algorithm, 4 for kt algorithm
+
+//General jet parameters
+SEEDTHRESHOLD     = 1.0;
+OVERLAPTHRESHOLD = 0.75;
+
 // Define Cone algorithm.
-C_SEEDTHRESHOLD     = 1.0;
 C_ADJACENCYCUT     = 2;
 C_MAXITERATIONS    = 100;
 C_IRATCH           = 1;
-C_OVERLAPTHRESHOLD = 0.75;
 
 //Define MidPoint algorithm.
-M_SEEDTHRESHOLD     =   1.0;
 M_CONEAREAFRACTION  =   0.25;
 M_MAXPAIRSIZE       =   2;
 M_MAXITERATIONS     =   100;
-M_OVERLAPTHRESHOLD  =  0.75;
 
 }
@@ -149 +150 @@
   }
 
+// General jet variables
+ SEEDTHRESHOLD     = 1.0;
+ OVERLAPTHRESHOLD = 0.75;
+
 // Define Cone algorithm.
- C_SEEDTHRESHOLD     = 1.0;
  C_ADJACENCYCUT     = 2;
  C_MAXITERATIONS    = 100;
  C_IRATCH           = 1;
- C_OVERLAPTHRESHOLD = 0.75;
 
 //Define MidPoint algorithm.
- M_SEEDTHRESHOLD     =   1.0;
  M_CONEAREAFRACTION  =   0.25;
  M_MAXPAIRSIZE       =   2;
  M_MAXITERATIONS     =   100;
- M_OVERLAPTHRESHOLD  =  0.75;
 
 }
@@ -250 +251 @@
   double Energie=0;
   for(unsigned int i=0; i < towers.size(); i++) {
-      if(towers[i].fourVector.pt() < M_SEEDTHRESHOLD) continue;
+      if(towers[i].fourVector.pt() < SEEDTHRESHOLD) continue;
       if((DeltaR(phi,eta,towers[i].fourVector.phi(),towers[i].fourVector.eta()) < TAU_CONE_ENERGY)) {
           Energie += towers[i].fourVector.E;