Changeset 41 in svn for trunk/Utilities

Timestamp:

Nov 18, 2008, 5:00:10 PM (16 years ago)

Author:

Xavier Rouby

Message:

bug removed. Now working ok with CMS towers

File:

• trunk/Utilities/Fastjet/plugins/CDFCones/interface/CalTower.hh (modified) (6 diffs)

trunk/Utilities/Fastjet/plugins/CDFCones/interface/CalTower.hh

@@ -4 +4 @@
 // Modified by X. Rouby for integration in Delphes
 // !!! the numbering of the towers (iEta, iPhi) is **NOT** following any convention of the corresponding experiment
+// v3 -- not working
 
 #include <cmath>
+#include <iostream>
 
 #ifndef M_PI
@@ -13 +15 @@
 const double pi = acos(-1);
 
-/* // CDF data : 22 towers. step=2.7° at the beginning, and after, it changes
+static bool einmal=true;
+/*
+ // CDF data : 22 towers. step=2.7° at the beginning, and after, it changes
 const unsigned int ntower = 22;
 const double TOWER_THETA[ntower+1] = {3.000,  5.700,  8.400, 11.100, 13.800, 16.500, 19.200, 21.900, 24.600, 27.300, 30.000,// step=2.7°
           33.524,  36.822, 40.261, 43.614, 47.436, 51.790, 56.735, 62.310, 68.516, 75.297, 82.526, 90.000 };
-const couble tower_eta_edges[ntower+1] = {
+const double tower_eta_edges[ntower+1] = {
     0.0,   0.130817437415,   0.259479460739,   0.384075299436,   0.503273260393,   0.616250691646,   0.72264587494,   0.822472442947,   
     0.916007799535,   1.00361552815,   1.10000635195,   1.19999982651,   1.31695789692,   1.41531379676,   1.52309848418, 1.64260787639,  
     1.77704423284,  1.93106912741,  2.1118548488,  2.33129451223,  2.61134904017,  3.00008274261,  3.64253335732 };
-const int tower_dphi[ntower] = { // list of the tower size in phi (in degrees) 
-        7.5, 7.5, 7.5, 7.5, 7.5, 7.5, 7.5, 15, 
-        15,  15,  15,  15,  15,  7.5, 7.5  7.5,
+const double tower_dphi[ntower] = { // list of the tower size in phi (in degrees) 
+        7.5, 7.5, 7.5, 7.5, 7.5, 7.5, 7.5, 15.,
+        15., 15., 15., 15., 15., 7.5, 7.5, 7.5,
         7.5, 7.5, 7.5, 7.5, 7.5, 7.5 };
 */
 
 // CMS data
-const unsigned int ntower = 41;
+const unsigned int ntower = 40;
 const double tower_eta_edges[ntower+1] = { // list of the edges of each tower, in eta, for eta>0, assuming a symmetric detector in eta<0 
     0., // lower limit of the most central tower
@@ -36 +40 @@
     4.700,  // lower limit of the most forward tower
     5.000}; // higher limit of the most forward tower
+
 const double tower_dphi[ntower] = { // list of the tower size in phi (in degrees)
-     5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-    10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
-    20,20 }; 
+     5, 5, 5, 5, 5,  5, 5, 5, 5, 5,  5, 5, 5, 5, 5,  5, 5, 5, 5, 10,
+    10,10,10,10,10, 10,10,10,10,10, 10,10,10,10,10, 10,10,10,20, 20 }; 
 
 
@@ -52 +56 @@
   CalTower(const double Et0, const double eta0, const double phi0): Et(Et0), eta(eta0), phi(phi0)
   {
+
         if (fabs(eta) > tower_eta_edges[ntower]) {iEta = -1; iPhi = -1; } // outside the detector
         else {  
@@ -57 +62 @@
                 double all_towers[nn];
                 unsigned int i =0;
-                for(unsigned int j= ntower-1; j>=0; j++, i++) all_towers[i] = -tower_eta_edges[j];
-                for(unsigned int j= 1; j <ntower+1; j++, i++) all_towers[i] =  tower_eta_edges[j];
-                for(i = 0; i< nn; i++) if(eta < all_towers[i]) iEta=i;
+                for(unsigned int j= ntower-1; i<ntower; j--,i++) { all_towers[i] = -tower_eta_edges[j];}
+                for(unsigned int j= 1; j <ntower+1; j++, i++) { all_towers[i] =  tower_eta_edges[j]; }
+                for(i = 0; i< nn; i++) { if(eta < all_towers[i]) {iEta=i; break;} }
 
                 for(unsigned int j=0; j<ntower; j++) {
-                        int wedge = int(360./tower_dphi[i]);
-                        iPhi = int(phi/(2.*pi)* wedge)%wedge;
+                        int wedge = int(360./tower_dphi[j]);
+                        iPhi = 0; int(phi/(2.*pi)* wedge)%wedge;
                 }
         }
-
-/*    if(fabs(eta) < pseudorapidity(TOWER_THETA[0])) { // |eta| < 3.64
-      if(eta <= 0){ // central particle, but negative eta
-        for(unsigned int i = 0; i < ntower-1; i++)
-          if(eta < pseudorapidity(180 - TOWER_THETA[i + 1])){ // eta < -3 ; -2.61 ; ... ; 0
-            iEta = 4 + i;   // <-- pourquio on commence à  4 ????
-            break;
-          }
-      } // central particle but negative eta
-      else{ // central particle but positive eta
-        for(unsigned int i = 0; i < ntower-1; i++)
-          if(-eta < pseudorapidity(180 - TOWER_THETA[i + 1])){ // eta > 3 ; 2.61 ; ... ; 0
-            iEta = 5+ 2*(ntower-2) - i;     //CDF iEta = 47 - i;
-            break;
-          }
-      } // central particle but positive eta  
-      if( (iEta >= 8 && iEta < 14) || (iEta >= 38 && iEta < 44) )
-        iPhi = int(phi/(2*pi)*48)%48;
-      else
-        iPhi = int(phi/(2*pi)*24)%24;
-    }
-    else{ // particle beyond detector reach : 
-      iEta = -1;
-      iPhi = -1;
-    }
-*/
   }
 
@@ -102 +81 @@
   }
 
-/* // converts theta angle [degrees] into pseudorapidity
+// converts theta angle [degrees] into pseudorapidity
  double pseudorapidity(const double theta) {
          return -log(tan( (theta/2.) * (pi/180.) ));
- }*/
+ }
 
 };