Fork me on GitHub

Changeset 8624f58 in git for modules


Ignore:
Timestamp:
Dec 19, 2014, 2:11:47 PM (10 years ago)
Author:
Pavel Demin <pavel.demin@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
ca29ad7
Parents:
c04eb8a
Message:

replace Ecal with ECal and Hcal with HCal

Location:
modules
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • modules/Calorimeter.cc

    rc04eb8a r8624f58  
    145145    fFractionMap[param[i*2].GetInt()] = make_pair(ecalFraction, hcalFraction);
    146146  }
     147
    147148/*
    148149  TFractionMap::iterator itFractionMap;
     
    154155
    155156  // read min E value for towers to be saved
    156   fEcalEnergyMin = GetDouble("EcalTowerMinEnergy", 0.0);
    157   fHcalEnergyMin = GetDouble("HcalTowerMinEnergy", 0.0);
    158 
    159   fEcalSigmaMin  = GetDouble("EcalTowerMinSignificance", 0.0);
    160   fHcalSigmaMin  = GetDouble("HcalTowerMinSignificance", 0.0);
    161 
     157  fECalEnergyMin = GetDouble("ECalMinEnergy", 0.0);
     158  fHCalEnergyMin = GetDouble("HCalMinEnergy", 0.0);
     159
     160  fECalSigmaMin  = GetDouble("ECalMinSignificance", 0.0);
     161  fHCalSigmaMin  = GetDouble("HCalMinSignificance", 0.0);
     162
     163  // switch on or off the dithering of the center of calorimeter towers
     164  fDitherTowerCenter = GetBool("DitherTowerCenter", true);
    162165
    163166  // read resolution formulas
     
    180183  fEFlowNeutralHadronOutputArray = ExportArray(GetString("EFlowNeutralHadronOutputArray", "eflowNeutralHadrons"));
    181184
    182   fDitherTowerCenter = GetBool("DitherTowerCenter", true);
    183185}
    184186
     
    440442
    441443  if(!fTower) return;
    442 //  cout<<"----------------------"<<endl;
    443 //  cout<<"Finalize Tower"<<endl;
    444 //  cout<<""<<endl;
    445 
    446444
    447445  ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
    448 
    449 //  ecalEnergy = gRandom->Gaus(fTowerECalEnergy, ecalSigma);
    450 //  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
    451446
    452447  ecalEnergy = LogNormal(fTowerECalEnergy, ecalSigma);
     
    455450  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
    456451
    457 //  hcalEnergy = gRandom->Gaus(fTowerHCalEnergy, hcalSigma);
    458 //  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
    459 
    460452  hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
    461453  hcalTime = (fTowerHCalWeightTime < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalWeightTime;
     
    465457  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
    466458
    467   ecalEnergy = (ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*ecalSigma) ? 0 : ecalEnergy;
    468   hcalEnergy = (hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*hcalSigma) ? 0 : hcalEnergy;
     459  ecalEnergy = (ecalEnergy < fECalEnergyMin || ecalEnergy < fECalSigmaMin*ecalSigma) ? 0 : ecalEnergy;
     460  hcalEnergy = (hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalSigmaMin*hcalSigma) ? 0 : hcalEnergy;
    469461
    470462  energy = ecalEnergy + hcalEnergy;
     
    484476  pt = energy / TMath::CosH(eta);
    485477
    486  // fTower->Position.SetXYZT(-time, 0.0, 0.0, time);
    487478  fTower->Position.SetPtEtaPhiE(1.0, eta, phi, time);
    488479  fTower->Momentum.SetPtEtaPhiE(pt, eta, phi, energy);
     
    515506
    516507  ecalEnergy -= fTrackECalEnergy;
    517   if(ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
     508  if(ecalEnergy < fECalEnergyMin || ecalEnergy < fECalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
    518509
    519510  hcalEnergy -= fTrackHCalEnergy;
    520   if(hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
     511  if(hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
    521512
    522513  energy = ecalEnergy + hcalEnergy;
     
    548539    fEFlowNeutralHadronOutputArray->Add(tower);
    549540  }
    550 
    551 
    552 
    553 
    554541}
    555542
  • modules/Calorimeter.h

    rc04eb8a r8624f58  
    7272  Int_t fTowerTrackHits, fTowerPhotonHits;
    7373
     74  Double_t fECalEnergyMin;
     75  Double_t fHCalEnergyMin;
     76
     77  Double_t fECalSigmaMin;
     78  Double_t fHCalSigmaMin;
     79
    7480  Bool_t fDitherTowerCenter;
    75 
    76   Double_t fEcalEnergyMin;
    77   Double_t fHcalEnergyMin;
    78 
    79   Double_t fEcalSigmaMin;
    80   Double_t fHcalSigmaMin;
    8181
    8282  TFractionMap fFractionMap; //!
Note: See TracChangeset for help on using the changeset viewer.