Changeset 38bf1ae in git

Timestamp:

Dec 21, 2014, 12:12:45 PM (10 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f10999a

Parents:

6cdc544

Message:

replace CalMinEnergy and CalMinSignificance with CalEnergyMin and CalEnergySignificanceMin

Files:

• cards/delphes_card_ATLAS.tcl (modified) (1 diff)
• cards/delphes_card_ATLAS_PileUp.tcl (modified) (1 diff)
• cards/delphes_card_CMS.tcl (modified) (1 diff)
• cards/delphes_card_CMS_NoFastJet.tcl (modified) (1 diff)
• cards/delphes_card_CMS_PileUp.tcl (modified) (1 diff)
• modules/Calorimeter.cc (modified) (9 diffs)
• modules/Calorimeter.h (modified) (1 diff)

cards/delphes_card_ATLAS.tcl

@@ -207 +207 @@
   set PhotonOutputArray photons
 
-  set ECalMinEnergy 0.50
-  set HCalMinEnergy 1.00
-
-  set ECalMinSignificance 1.0
-  set HCalMinSignificance 1.0
+  set ECalEnergyMin 0.50
+  set HCalEnergyMin 1.00
+
+  set ECalEnergySignificanceMin 1.0
+  set HCalEnergySignificanceMin 1.0
   
   set EFlowTrackOutputArray eflowTracks

cards/delphes_card_ATLAS_PileUp.tcl

@@ -249 +249 @@
   set PhotonOutputArray photons
 
-  set ECalMinEnergy 0.50
-  set HCalMinEnergy 1.00
-
-  set ECalMinSignificance 1.0
-  set HCalMinSignificance 1.0
+  set ECalEnergyMin 0.50
+  set HCalEnergyMin 1.00
+
+  set ECalEnergySignificanceMin 1.0
+  set HCalEnergySignificanceMin 1.0
 
   set EFlowTrackOutputArray eflowTracks

cards/delphes_card_CMS.tcl

@@ -212 +212 @@
   set PhotonOutputArray photons
 
-  set ECalMinEnergy 0.5
-  set HCalMinEnergy 1.0
-
-  set ECalMinSignificance 1.0
-  set HCalMinSignificance 1.0
+  set ECalEnergyMin 0.5
+  set HCalEnergyMin 1.0
+
+  set ECalEnergySignificanceMin 1.0
+  set HCalEnergySignificanceMin 1.0
    
   set EFlowTrackOutputArray eflowTracks

cards/delphes_card_CMS_NoFastJet.tcl

@@ -186 +186 @@
   set PhotonOutputArray photons
 
-  set ECalMinEnergy 0.5
-  set HCalMinEnergy 1.0
-
-  set ECalMinSignificance 1.0
-  set HCalMinSignificance 1.0
+  set ECalEnergyMin 0.5
+  set HCalEnergyMin 1.0
+
+  set ECalEnergySignificanceMin 1.0
+  set HCalEnergySignificanceMin 1.0
    
   set EFlowTrackOutputArray eflowTracks

cards/delphes_card_CMS_PileUp.tcl

@@ -255 +255 @@
   set PhotonOutputArray photons
 
-  set ECalMinEnergy 0.5
-  set HCalMinEnergy 1.0
-
-  set ECalMinSignificance 1.0
-  set HCalMinSignificance 1.0
+  set ECalEnergyMin 0.5
+  set HCalEnergyMin 1.0
+
+  set ECalEnergySignificanceMin 1.0
+  set HCalEnergySignificanceMin 1.0
 
   set EFlowTrackOutputArray eflowTracks

modules/Calorimeter.cc

@@ -151 +151 @@
 
   // read min E value for towers to be saved
-  fECalEnergyMin = GetDouble("ECalMinEnergy", 0.0);
-  fHCalEnergyMin = GetDouble("HCalMinEnergy", 0.0);
-
-  fECalSigmaMin  = GetDouble("ECalMinSignificance", 0.0);
-  fHCalSigmaMin  = GetDouble("HCalMinSignificance", 0.0);
+  fECalEnergyMin = GetDouble("ECalEnergyMin", 0.0);
+  fHCalEnergyMin = GetDouble("HCalEnergyMin", 0.0);
+
+  fECalEnergySignificanceMin = GetDouble("ECalEnergySignificanceMin", 0.0);
+  fHCalEnergySignificanceMin = GetDouble("HCalEnergySignificanceMin", 0.0);
 
   // switch on or off the dithering of the center of calorimeter towers
@@ -178 +178 @@
   fEFlowPhotonOutputArray = ExportArray(GetString("EFlowPhotonOutputArray", "eflowPhotons"));
   fEFlowNeutralHadronOutputArray = ExportArray(GetString("EFlowNeutralHadronOutputArray", "eflowNeutralHadrons"));
-
 }
 
@@ -440 +439 @@
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
+  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
 
   ecalEnergy = LogNormal(fTowerECalEnergy, ecalSigma);
-  ecalTime = (fTowerECalTimeWeight < 1.0E-09 ) ? 0 : fTowerECalTime/fTowerECalTimeWeight;
-
-  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerHCalEnergy);
-
   hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
-  hcalTime = (fTowerHCalTimeWeight < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalTimeWeight;
-
+
+  ecalTime = (fTowerECalTimeWeight < 1.0E-09 ) ? 0.0 : fTowerECalTime/fTowerECalTimeWeight;
+  hcalTime = (fTowerHCalTimeWeight < 1.0E-09 ) ? 0.0 : fTowerHCalTime/fTowerHCalTimeWeight;
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);
   hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
 
-  ecalEnergy = (ecalEnergy < fECalEnergyMin || ecalEnergy < fECalSigmaMin*ecalSigma) ? 0 : ecalEnergy;
-  hcalEnergy = (hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalSigmaMin*hcalSigma) ? 0 : hcalEnergy;
+  if(ecalEnergy < fECalEnergyMin || ecalEnergy < fECalEnergySignificanceMin*ecalSigma) ecalEnergy = 0.0;
+  if(hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalEnergySignificanceMin*hcalSigma) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;
@@ -461 +458 @@
   if(fDitherTowerCenter)
   {
-     eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
-     phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
+    eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
+    phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
   }
   else
   {
-     eta = fTowerEta;
-     phi = fTowerPhi;
+    eta = fTowerEta;
+    phi = fTowerPhi;
   }
 
@@ -482 +479 @@
   fTower->Edges[3] = fTowerEdges[3];
 
-  if( energy > 0.0 )
+  if(energy > 0.0)
   {
     if(fTowerPhotonHits > 0 && fTowerTrackHits == 0)
@@ -502 +499 @@
 
   ecalEnergy -= fTrackECalEnergy;
-  if(ecalEnergy < fECalEnergyMin || ecalEnergy < fECalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
-
   hcalEnergy -= fTrackHCalEnergy;
-  if(hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
+
+  ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy);
+  hcalSigma = fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy);
+
+  if(ecalEnergy < fECalEnergyMin || ecalEnergy < fECalEnergySignificanceMin*ecalSigma) ecalEnergy = 0.0;
+  if(hcalEnergy < fHCalEnergyMin || hcalEnergy < fHCalEnergySignificanceMin*hcalSigma) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;
@@ -518 +518 @@
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, ecalEnergy);
     tower->Eem = ecalEnergy;
-    tower->Ehad = 0;
+    tower->Ehad = 0.0;
 
     fEFlowPhotonOutputArray->Add(tower);
@@ -530 +530 @@
 
     tower->Momentum.SetPtEtaPhiE(pt, eta, phi, hcalEnergy);
-    tower->Eem = 0;
+    tower->Eem = 0.0;
     tower->Ehad = hcalEnergy;
 
@@ -548 +548 @@
     a = TMath::Log(mean) - 0.5*b*b;
 
-    return TMath::Exp(a + b*gRandom->Gaus(0, 1));
+    return TMath::Exp(a + b*gRandom->Gaus(0.0, 1.0));
   }
   else

modules/Calorimeter.h

@@ -71 +71 @@
   Double_t fHCalEnergyMin;
 
-  Double_t fECalSigmaMin;
-  Double_t fHCalSigmaMin;
+  Double_t fECalEnergySignificanceMin;
+  Double_t fHCalEnergySignificanceMin;
 
   Bool_t fDitherTowerCenter;