Changeset 321 in svn for trunk/Delphes.cpp

Timestamp:

Mar 11, 2009, 12:53:50 PM (16 years ago)

Author:

Xavier Rouby

Message:

Isolation updated. ptiso implemented. etrat prepared but not finished

File:

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

trunk/Delphes.cpp

@@ -571 +571 @@
           // sorts the vector and smears duplicates 
       list_of_towers_with_photon.mergeDuplicates(); 
-      
-      for(unsigned int i=0; i<list_of_towers_with_photon.size(); i++) 
-        {
+      for(unsigned int i=0; i<list_of_towers_with_photon.size(); i++) { 
           float eta = list_of_towers_with_photon[i].getEta(); 
           float phi = list_of_towers_with_photon[i].getPhi();
@@ -588 +586 @@
       // 2.2.1 ********************* sorting collections by decreasing pt
       DET->SortedVector(electron); 
-      float iPhiEl=0,iEtaEl=0;
+      float iPhiEl=0,iEtaEl=0,ptisoEl=0;
       for(unsigned int i=0; i < electron.size(); i++) 
         {
@@ -596 +594 @@
           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);      
+          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); 
           D_CaloTower calElec(list_of_active_towers.getElement(iEtaEl,iPhiEl));
@@ -603 +602 @@
       
       DET->SortedVector(muon);
-      float iPhiMu=0,iEtaMu=0;
+      float iPhiMu=0,iEtaMu=0,ptisoMu=0;
       for(unsigned int i=0; i < muon.size(); i++) 
         {
@@ -611 +610 @@
           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); 
-          DET->BinEtaPhi(elementMu->PhiCalo,elementMu->EtaCalo,iPhiMu,iEtaMu); 
+          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);
           D_CaloTower calMuon(list_of_active_towers.getElement(iEtaMu,iPhiMu));
-          elementMu->EHoverEE = calMuon.getEhad()/calMuon.getEem();
+          if( calMuon.getEem() !=0 ) elementMu->EHoverEE = calMuon.getEhad()/calMuon.getEem();
+          else elementMu->EHoverEE = UNDEFINED;
+          elementMu->EtRatio = DET->CaloIsolation(muon[i], list_of_active_towers);
         }