Changeset 49234af in git for modules

Timestamp:

Dec 9, 2014, 1:27:13 PM (10 years ago)

Author:

Michele <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

37deb3b, 9e991f8

Parents:

f6b6ee7 (diff), e7e90df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'TestFastJet310b1'

Location:

modules

Files:

• Calorimeter.cc (modified) (6 diffs)
• Calorimeter.h (modified) (1 diff)
• FastJetFinder.cc (modified) (3 diffs)
• FastJetFinderGrid.h (added)
• FastJetGridMedianEstimator.cc (added)
• FastJetGridMedianEstimator.h (added)
• ModulesLinkDef.h (modified) (4 diffs)
• PdgCodeFilter.cc (added)
• PdgCodeFilter.h (added)
• SimpleCalorimeter.cc (modified) (3 diffs)
• SimpleCalorimeter.h (modified) (1 diff)

modules/Calorimeter.cc

@@ -153 +153 @@
   }
 */
+
+  // read min E value for towers to be saved
+  fEcalEnergyMin = GetDouble("EcalTowerMinEnergy", 0.0); 
+  fHcalEnergyMin = GetDouble("HcalTowerMinEnergy", 0.0); 
+  
+  fEcalSigmaMin  = GetDouble("EcalTowerMinSignificance", 0.0); 
+  fHcalSigmaMin  = GetDouble("HcalTowerMinSignificance", 0.0); 
+
+ 
   // read resolution formulas
   fECalResolutionFormula->Compile(GetString("ECalResolutionFormula", "0"));
@@ -432 +441 @@
 
   if(!fTower) return;
+//  cout<<"----------------------"<<endl;
+//  cout<<"Finalize Tower"<<endl;
+//  cout<<""<<endl;
+
 
   ecalSigma = fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, fTowerECalEnergy);
@@ -448 +461 @@
   hcalEnergy = LogNormal(fTowerHCalEnergy, hcalSigma);
   hcalTime = (fTowerHCalWeightTime < 1.0E-09 ) ? 0 : fTowerHCalTime/fTowerHCalWeightTime;
+
+  
+  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;
 
   energy = ecalEnergy + hcalEnergy;
@@ -471 +491 @@
   fTower->Edges[3] = fTowerEdges[3];
 
-
-  // fill calorimeter towers
-  if(energy > 0.0)
+  if( energy > 0.0 )
   {
     if(fTowerPhotonHits > 0 && fTowerTrackHits == 0)
@@ -493 +511 @@
 
   ecalEnergy -= fTrackECalEnergy;
-  if(ecalEnergy < 0.0) ecalEnergy = 0.0;
+  if(ecalEnergy < fEcalEnergyMin || ecalEnergy < fEcalSigmaMin*fECalResolutionFormula->Eval(0.0, fTowerEta, 0.0, ecalEnergy)) ecalEnergy = 0.0;
 
   hcalEnergy -= fTrackHCalEnergy;
-  if(hcalEnergy < 0.0) hcalEnergy = 0.0;
+  if(hcalEnergy < fHcalEnergyMin || hcalEnergy < fHcalSigmaMin*fHCalResolutionFormula->Eval(0.0, fTowerEta, 0.0, hcalEnergy)) hcalEnergy = 0.0;
 
   energy = ecalEnergy + hcalEnergy;
 
-  
-  // save ECAL and/or HCAL energy excess as an energy flow tower
   if(ecalEnergy > 0.0)
   {
@@ -515 +531 @@
     fEFlowPhotonOutputArray->Add(tower);
   }
-
   if(hcalEnergy > 0.0)
   {

modules/Calorimeter.h

@@ -72 +72 @@
   Int_t fTowerTrackHits, fTowerPhotonHits;
 
+  Double_t fEcalEnergyMin;
+  Double_t fHcalEnergyMin;
+  
+  Double_t fEcalSigmaMin;
+  Double_t fHcalSigmaMin;
+
   TFractionMap fFractionMap; //!
   TBinMap fBinMap; //!

modules/FastJetFinder.cc

@@ -241 +241 @@
   Candidate *candidate, *constituent;
   TLorentzVector momentum;
+  
+  TLorentzVector constmomentum;
+  
   Double_t deta, dphi, detaMax, dphiMax;
   Double_t time, weightTime, avTime;
@@ -304 +307 @@
   for(itOutputList = outputList.begin(); itOutputList != outputList.end(); ++itOutputList)
   {
-    momentum.SetPxPyPzE(itOutputList->px(), itOutputList->py(), itOutputList->pz(), itOutputList->E());
+    jet = *itOutputList;
+    if(fJetAlgorithm == 7) jet = join(jet.constituents());
+    
+    momentum.SetPxPyPzE(jet.px(), jet.py(), jet.pz(), jet.E());
+    
     area.reset(0.0, 0.0, 0.0, 0.0);
     if(fAreaDefinition) area = itOutputList->area_4vector();
@@ -315 +322 @@
     inputList.clear();
     inputList = sequence->constituents(*itOutputList);
+
+    constmomentum.SetPxPyPzE(0.0,0.0,0.0,0.0);;
 
     for(itInputList = inputList.begin(); itInputList != inputList.end(); ++itInputList)
     {
       constituent = static_cast<Candidate*>(fInputArray->At(itInputList->user_index()));
+
+      constmomentum += constituent->Momentum;
 
       deta = TMath::Abs(momentum.Eta() - constituent->Momentum.Eta());

modules/ModulesLinkDef.h

@@ -33 +33 @@
 
 #include "modules/FastJetFinder.h"
+#include "modules/FastJetGridMedianEstimator.h"
 #include "modules/ParticlePropagator.h"
 #include "modules/Efficiency.h"
@@ -56 +57 @@
 #include "modules/ConstituentFilter.h"
 #include "modules/StatusPidFilter.h"
+#include "modules/PdgCodeFilter.h"
 #include "modules/Cloner.h"
 #include "modules/Weighter.h"
@@ -70 +72 @@
 
 #pragma link C++ class FastJetFinder+;
+#pragma link C++ class FastJetGridMedianEstimator+;
 #pragma link C++ class ParticlePropagator+;
 #pragma link C++ class Efficiency+;
@@ -93 +96 @@
 #pragma link C++ class ConstituentFilter+;
 #pragma link C++ class StatusPidFilter+;
+#pragma link C++ class PdgCodeFilter+;
 #pragma link C++ class Cloner+;
 #pragma link C++ class Weighter+;

modules/SimpleCalorimeter.cc

@@ -147 +147 @@
   }
 */
+
+  // read min E value for towers to be saved
+  fEnergyMin = GetDouble("TowerMinEnergy", 0.0); 
+  fSigmaMin  = GetDouble("TowerMinSignificance", 0.0); 
+ 
   // read resolution formulas
   fResolutionFormula->Compile(GetString("ResolutionFormula", "0"));
@@ -402 +407 @@
   time = (fTowerWeightTime < 1.0E-09 ) ? 0 : fTowerTime/fTowerWeightTime;
 
+  sigma = fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy);
+  
+  energy = (energy < fEnergyMin || energy < fSigmaMin*sigma) ? 0 : energy;
+  
   eta = gRandom->Uniform(fTowerEdges[0], fTowerEdges[1]);
   phi = gRandom->Uniform(fTowerEdges[2], fTowerEdges[3]);
@@ -423 +432 @@
   // fill energy flow candidates
   energy -= fTrackEnergy;
-  if(energy < 0.0) energy = 0.0;
+  if(energy < fEnergyMin || energy < fSigmaMin*fResolutionFormula->Eval(0.0, fTowerEta, 0.0, energy)) energy = 0.0;
    
   // save energy excess as an energy flow tower

modules/SimpleCalorimeter.h

@@ -72 +72 @@
   Int_t fTowerTrackHits, fTowerPhotonHits;
 
+  Double_t fEnergyMin;
+  Double_t fSigmaMin;
+
   TFractionMap fFractionMap; //!
   TBinMap fBinMap; //!