Changeset 312 in svn for trunk

Timestamp:

Mar 10, 2009, 12:24:44 PM (15 years ago)

Author:

severine ovyn

Message:

now OK for elec and muon

File:

• trunk/Delphes.cpp (modified) (3 diffs)

trunk/Delphes.cpp

@@ -588 +588 @@
       // 2.2.1 ********************* sorting collections by decreasing pt
       DET->SortedVector(electron); 
+      float iPhiEl=0,iEtaEl=0;
       for(unsigned int i=0; i < electron.size(); i++) 
         {
@@ -595 +596 @@
           elementElec->PhiCalo = electron[i].PhiCalo();
           elementElec->Charge = sign(electron[i].PID());
-          elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone);//isolation based on tracks
-          
-          D_CaloTower calElec(list_of_active_towers.getElement(electron[i].EtaCalo(),electron[i].PhiCalo()));
+          elementElec->IsolFlag = DET->Isolation(electron[i].Phi(),electron[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone);      
+          DET->BinEtaPhi(elementElec->PhiCalo,elementElec->EtaCalo,iPhiEl,iEtaEl); 
+          D_CaloTower calElec(list_of_active_towers.getElement(iEtaEl,iPhiEl));
           elementElec->EHoverEE = calElec.getEhad()/calElec.getEem();
-        }                                                                                       /////////////// HARDCODING
+        }                       
       
       DET->SortedVector(muon);
+      float iPhiMu=0,iEtaMu=0;
       for(unsigned int i=0; i < muon.size(); i++) 
         {
@@ -609 +611 @@
           elementMu->EtaCalo = muon[i].EtaCalo(); 
           elementMu->PhiCalo = muon[i].PhiCalo();
-          elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone); /////////////// HARDCODING
-          D_CaloTower calMuon(list_of_active_towers.getElement(muon[i].EtaCalo(),muon[i].PhiCalo()));
+          elementMu->IsolFlag = DET->Isolation(muon[i].Phi(),muon[i].Eta(),TrackCentral,DET->ISOL_PT,DET->ISOL_Cone); 
+          DET->BinEtaPhi(elementMu->PhiCalo,elementMu->EtaCalo,iPhiMu,iEtaMu); 
+          D_CaloTower calMuon(list_of_active_towers.getElement(iEtaMu,iPhiMu));
           elementMu->EHoverEE = calMuon.getEhad()/calMuon.getEem();
         }