Changeset 4f00e0b in git for modules

Timestamp:

Oct 5, 2015, 6:10:37 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

ce4feac

Parents:

c62695e

Message:

fixed muons for high pt eflow

Location:

modules

Files:

• Calorimeter.cc (modified) (1 diff)
• SimpleCalorimeter.cc (modified) (1 diff)

modules/Calorimeter.cc

@@ -528 +528 @@
 
      // charged particle has to deposit either in ECAL or HCAL
- 
-     if(ecalFraction < 1.0E-9 && hcalFraction < 1.0E-9) continue;  
-     if(ecalFraction > 1.0E-9 && hcalFraction > 1.0E-9) continue;  
- 
-     if(ecalFraction > 1.0E-9)
+     
+     if(ecalFraction > 1.0E-9 && hcalFraction < 1.0E-9 )
      {
+       ecalTrkSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());     
        if(track->TrackResolution < ecalTrkSigma/momentum.E()) 
        {
-         ecalTrkSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());  
          ecalEnergy -= momentum.E();
          fEFlowTrackOutputArray->Add(track);        
-       }
-    
+       }   
      }
-    
-     if(hcalFraction > 1.0E-9)
+     else if(ecalFraction < 1.0E-9 && hcalFraction > 1.0E-9 )
      {
+       hcalTrkSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());   
        if(track->TrackResolution < hcalTrkSigma/momentum.E())
        {
-         hcalTrkSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());  
          hcalEnergy -= momentum.E();
          fEFlowTrackOutputArray->Add(track);        
        }
      }
+     else if(pdgCode == 13) 
+     {
+       fEFlowTrackOutputArray->Add(track); 
+     }
   }
 

modules/SimpleCalorimeter.cc

@@ -466 +466 @@
    
      // charged particle has to deposit either in ECAL or HCAL
-     if(fraction < 1.0E-9) continue;  
-    
-     trkSigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());       
-  
-     if(track->TrackResolution < trkSigma/momentum.E()) 
+     if(fraction > 1.0E-9)
      {
-        energy -= momentum.E();
-        fEFlowTrackOutputArray->Add(track);
+       trkSigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());       
+       if(track->TrackResolution < trkSigma/momentum.E()) 
+       {
+         energy -= momentum.E();
+         fEFlowTrackOutputArray->Add(track);
+       }
      }
-
+     //forward all tracks from ECAL to HCAL
+     else if(fIsEcal)
+     {
+       fEFlowTrackOutputArray->Add(track);
+     }
+     //store muons from HCAL 
+     else if(pdgCode == 13)
+     {
+       fEFlowTrackOutputArray->Add(track);
+     }
   }