Fork me on GitHub

Changeset 9da65a5 in git


Ignore:
Timestamp:
Oct 8, 2015, 4:22:02 PM (9 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
df636c74
Parents:
cdeea24
Message:

fix ecalEnergy and hcalEnergy in Calorimeter

File:
1 edited

Legend:

Unmodified
Added
Removed
  • modules/Calorimeter.cc

    rcdeea24 r9da65a5  
    404404      }
    405405
    406       if(fECalTrackFractions[number] > 1.0E-9 && fHCalTrackFractions[number] < 1.0E-9 )
     406      if(fECalTrackFractions[number] > 1.0E-9 && fHCalTrackFractions[number] < 1.0E-9)
    407407      {
    408408        ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
     
    418418        }
    419419      }
    420       else if(fECalTrackFractions[number] < 1.0E-9 && fHCalTrackFractions[number] > 1.0E-9 )
     420      else if(fECalTrackFractions[number] < 1.0E-9 && fHCalTrackFractions[number] > 1.0E-9)
    421421      {
    422422        hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, momentum.E());
     
    432432        }
    433433      }
     434      else if(fECalTrackFractions[number] < 1.0E-9 && fHCalTrackFractions[number] < 1.0E-9)
     435      {
     436        fEFlowTrackOutputArray->Add(track);
     437      }
    434438
    435439      continue;
     
    564568
    565569    track->Momentum *= ecalEnergy/fECalTrackEnergy[0];
    566     ecalEnergy = 0.0;
    567570
    568571    fEFlowTrackOutputArray->Add(track);
     
    587590
    588591    track->Momentum *= hcalEnergy/fHCalTrackEnergy[0];
    589     hcalEnergy = 0.0;
    590592
    591593    fEFlowTrackOutputArray->Add(track);
     
    602604  }
    603605
     606  if(fECalTowerTrackArray[0]->GetEntriesFast() > 0) ecalEnergy = 0.0;
     607  if(fHCalTowerTrackArray[0]->GetEntriesFast() > 0) hcalEnergy = 0.0;
     608
    604609  ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);
    605610  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
Note: See TracChangeset for help on using the changeset viewer.