Changeset 423 in svn for trunk

Timestamp:

Jun 3, 2009, 2:17:37 PM (15 years ago)

Author:

Xavier Rouby

Message:

BinEtaPhi : put the particle in the middle of the towers

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• src/SmearUtil.cc (modified) (3 diffs)

trunk/CHANGELOG

@@ -3 +3 @@
    - Nevents implemented in DetectorCards
    - bug removed in bad inputfile type identification (".hep" vs ".lhe")
+   - BinEtaPhi : now use the middle of the tower and not its lower edge in eta and in phi
  /-----------------------------------------\
 | 22 May 2009: release Version1.7           |

trunk/src/SmearUtil.cc

@@ -1322 +1322 @@
 
   //********** returns a segmented value for eta and phi, for calo towers *****
+/*
 void RESOLution::BinEtaPhi(const float phi, const float eta, float& iPhi, float& iEta){
    iEta = UNDEFINED; 
    int index= iUNDEFINED;
    for (unsigned int i=1; i< TOWER_number+1; i++) {
-        if(fabs(eta)>TOWER_eta_edges[i-1] && fabs(eta)<TOWER_eta_edges[i]) {
-                iEta = (eta>0) ? TOWER_eta_edges[i-1] : -TOWER_eta_edges[i];
+        if(fabs(eta)>=TOWER_eta_edges[i-1] && fabs(eta)<TOWER_eta_edges[i]) {
+        //if(fabs(eta)>TOWER_eta_edges[i-1] && fabs(eta)<TOWER_eta_edges[i]) {
+                float deta = TOWER_eta_edges[i] - TOWER_eta_edges[i-1];
+        //      iEta = (eta>0) ? TOWER_eta_edges[i-1] : -TOWER_eta_edges[i];
+                iEta + deta/2.; // update Delphes > 1.7
                 index = i-1;
                 break;
@@ -1338 +1342 @@
         float low = -pi+(i-1)*dphi;
         float high= low+dphi;
-        if(phi > low && phi < high ){
-                iPhi = low; 
+        if(phi >= low && phi < high ){
+        //if(phi > low && phi < high ){
+                //iPhi = low; 
+                iPhi = low+dphi/2.;  // update Delphes > 1.7
                 break;
         } 
@@ -1345 +1351 @@
    if (phi > pi-dphi) iPhi = pi-dphi;
 }
-
-
+*/
+void RESOLution::BinEtaPhi(const float phi, const float eta, float& iPhi, float& iEta){
+   iEta = UNDEFINED;
+   int index= iUNDEFINED;
+   for (unsigned int i=1; i< TOWER_number+1; i++) {
+        if(fabs(eta)>TOWER_eta_edges[i-1] && fabs(eta)<=TOWER_eta_edges[i]) {
+                iEta = (eta>0) ? ((TOWER_eta_edges[i-1]+TOWER_eta_edges[i])/2.0) : -((TOWER_eta_edges[i-1]+TOWER_eta_edges[i])/2.0);
+                index = i-1;
+                break;
+        }
+   }
+   if(index==UNDEFINED) return; 
+   iPhi = UNDEFINED;
+   float dphi = TOWER_dphi[index]*pi/180.; 
+   for (unsigned int i=1; i < 360/TOWER_dphi[index]; i++ ) {
+        float low = -pi+(i-1)*dphi;
+        float high= low+dphi;
+        if(phi > low && phi <= high ){
+                iPhi = (low+high)/2.0; 
+                break;
+        } 
+   }
+   if (phi > pi-dphi) iPhi = pi-dphi;
+}
 
 //**************************** Returns the delta Phi ****************************