Fork me on GitHub

Changeset 8624f58 in git


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

Files:
9 edited

Legend:

Unmodified
Added
Removed

  • cards/delphes_card_ATLAS.tcl

    rc04eb8a r8624f58  
    207207  set PhotonOutputArray photons
    208208
    209   set EcalTowerMinEnergy 0.50
    210   set HcalTowerMinEnergy 1.00
    211 
    212   set EcalTowerMinSignificance 1.0
    213   set HcalTowerMinSignificance 1.0
     209  set ECalMinEnergy 0.50
     210  set HCalMinEnergy 1.00
     211
     212  set ECalMinSignificance 1.0
     213  set HCalMinSignificance 1.0
    214214 
    215215  set EFlowTrackOutputArray eflowTracks

  • cards/delphes_card_ATLAS_PileUp.tcl

    rc04eb8a r8624f58  
    249249  set PhotonOutputArray photons
    250250
    251   set EcalTowerMinEnergy 0.50
    252   set HcalTowerMinEnergy 1.00
    253 
    254   set EcalTowerMinSignificance 1.0
    255   set HcalTowerMinSignificance 1.0
     251  set ECalMinEnergy 0.50
     252  set HCalMinEnergy 1.00
     253
     254  set ECalMinSignificance 1.0
     255  set HCalMinSignificance 1.0
    256256
    257257  set EFlowTrackOutputArray eflowTracks

  • cards/delphes_card_CMS.tcl

    rc04eb8a r8624f58  
    212212  set PhotonOutputArray photons
    213213
    214   set EcalTowerMinEnergy 0.5
    215   set HcalTowerMinEnergy 1.0
    216 
    217   set EcalTowerMinSignificance 1.0
    218   set HcalTowerMinSignificance 1.0
     214  set ECalMinEnergy 0.5
     215  set HCalMinEnergy 1.0
     216
     217  set ECalMinSignificance 1.0
     218  set HCalMinSignificance 1.0
    219219   
    220220  set EFlowTrackOutputArray eflowTracks

  • cards/delphes_card_CMS_NoFastJet.tcl

    rc04eb8a r8624f58  
    186186  set PhotonOutputArray photons
    187187
    188   set EcalTowerMinEnergy 0.5
    189   set HcalTowerMinEnergy 1.0
    190 
    191   set EcalTowerMinSignificance 1.0
    192   set HcalTowerMinSignificance 1.0
     188  set ECalMinEnergy 0.5
     189  set HCalMinEnergy 1.0
     190
     191  set ECalMinSignificance 1.0
     192  set HCalMinSignificance 1.0
    193193   
    194194  set EFlowTrackOutputArray eflowTracks

  • cards/delphes_card_CMS_PileUp.tcl

    rc04eb8a r8624f58  
    255255  set PhotonOutputArray photons
    256256
    257   set EcalTowerMinEnergy 0.5
    258   set HcalTowerMinEnergy 1.0
    259 
    260   set EcalTowerMinSignificance 1.0
    261   set HcalTowerMinSignificance 1.0
     257  set ECalMinEnergy 0.5
     258  set HCalMinEnergy 1.0
     259
     260  set ECalMinSignificance 1.0
     261  set HCalMinSignificance 1.0
    262262
    263263  set EFlowTrackOutputArray eflowTracks

  • cards/delphes_card_FCC_basic.tcl

    rc04eb8a r8624f58  
    1818  ImpactParameterSmearing
    1919 
    20   Ecal
    21   Hcal
     20  ECal
     21  HCal
    2222 
    2323  TowerMerger
    … …  
    219219#############
    220220
    221 module SimpleCalorimeter Ecal {
     221module SimpleCalorimeter ECal {
    222222  set ParticleInputArray ParticlePropagator/stableParticles
    223223  set TrackInputArray ImpactParameterSmearing/tracks
    … …  
    281281#############
    282282
    283 module SimpleCalorimeter Hcal {
     283module SimpleCalorimeter HCal {
    284284  set ParticleInputArray ParticlePropagator/stableParticles
    285285  set TrackInputArray ImpactParameterSmearing/tracks
    … …  
    346346module Merger TowerMerger {
    347347# add InputArray InputArray
    348   add InputArray Ecal/ecalTowers
    349   add InputArray Hcal/hcalTowers
     348  add InputArray ECal/ecalTowers
     349  add InputArray HCal/hcalTowers
    350350  set OutputArray towers
    351351}
    … …  
    358358# add InputArray InputArray
    359359  add InputArray ImpactParameterSmearing/tracks
    360   add InputArray Ecal/eflowPhotons
    361   add InputArray Hcal/eflowNeutralHadrons
     360  add InputArray ECal/eflowPhotons
     361  add InputArray HCal/eflowNeutralHadrons
    362362  set OutputArray eflow
    363363}
    … …  
    512512 
    513513  add Branch ChargedHadronMomentumSmearing/chargedHadrons ChargedHadron Track
    514   add Branch Hcal/eflowNeutralHadrons NeutralHadron Tower
    515   add Branch Ecal/eflowPhotons Photon Photon
     514  add Branch HCal/eflowNeutralHadrons NeutralHadron Tower
     515  add Branch ECal/eflowPhotons Photon Photon
    516516
    517517  add Branch ElectronEnergySmearing/electrons Electron Electron

  • cards/delphes_card_LHCb.tcl

    rc04eb8a r8624f58  
    2020  IdentificationMap
    2121 
    22   Ecal
    23   Hcal
     22  ECal
     23  HCal
    2424
    2525  TreeWriter
    … …  
    217217#############
    218218
    219 module SimpleCalorimeter Ecal {
     219module SimpleCalorimeter ECal {
    220220  set ParticleInputArray ParticlePropagator/stableParticles
    221221  set TrackInputArray IdentificationMap/tracks
    … …  
    292292#############
    293293
    294 module SimpleCalorimeter Hcal {
     294module SimpleCalorimeter HCal {
    295295  set ParticleInputArray ParticlePropagator/stableParticles
    296296  set TrackInputArray IdentificationMap/tracks
    … …  
    369369
    370370  add Branch IdentificationMap/tracks Track Track
    371   add Branch Hcal/eflowNeutralHadrons NeutralHadron Tower
    372   add Branch Ecal/eflowPhotons Photon Photon
    373  
    374 }
    375 
     371  add Branch HCal/eflowNeutralHadrons NeutralHadron Tower
     372  add Branch ECal/eflowPhotons Photon Photon
     373 
     374}
     375

  • 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.