Changeset 550 in svn for trunk/Delphes.cpp

Timestamp:

Feb 22, 2010, 7:38:15 PM (15 years ago)

Author:

severine ovyn

Message:

changements pour EtRatio muons et electrons. Bugge

File:

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

trunk/Delphes.cpp

@@ -628 +628 @@
           elementElec->IsolFlag = DET->Isolation(electron[i],TrackCentral,DET->ISOL_PT,DET->ISOL_Cone,ptisoEl);
           elementElec->IsolPt = ptisoEl;
-          DET->BinEtaPhi(elementElec->PhiCalo,elementElec->EtaCalo,iPhiEl,iEtaEl); 
+
+cout << "\nC'est un electron\n";
+          int electron_tower_index = DET->BinEtaPhi(elementElec->PhiCalo,elementElec->EtaCalo,iPhiEl,iEtaEl); 
           D_CaloTower calElec(list_of_active_towers.getElement(iEtaEl,iPhiEl));
           elementElec->EHoverEE = calElec.getEhad()/calElec.getEem();
+          elementElec->EtRatio =  DET->CaloIsolation(muon[i], list_of_active_towers,iPhiEl,iEtaEl,electron_tower_index);
         }                       
       
@@ -644 +647 @@
           elementMu->IsolFlag = DET->Isolation(muon[i],TrackCentral,DET->ISOL_PT,DET->ISOL_Cone,ptisoMu); 
           elementMu->IsolPt = ptisoMu;
-          DET->BinEtaPhi(elementMu->PhiCalo,elementMu->EtaCalo,iPhiMu,iEtaMu);
+
+cout << "\nC'est un muon\n";
+          // binning of the muon position in calo
+          int muon_tower_index = DET->BinEtaPhi(elementMu->PhiCalo,elementMu->EtaCalo,iPhiMu,iEtaMu);
           D_CaloTower calMuon(list_of_active_towers.getElement(iEtaMu,iPhiMu));
           if( calMuon.getEem() !=0 ) elementMu->EHoverEE = calMuon.getEhad()/calMuon.getEem();
           else elementMu->EHoverEE = UNDEFINED;
-          elementMu->EtRatio = DET->CaloIsolation(muon[i], list_of_active_towers,iPhiMu,iEtaMu);
+          elementMu->EtRatio = DET->CaloIsolation(muon[i], list_of_active_towers,iPhiMu,iEtaMu,muon_tower_index);
         }