Changes in / [7c5b8f3:288a5fc] in git
- Files:
-
- 2 deleted
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
Makefile
r7c5b8f3 r288a5fc 446 446 modules/VertexFinderDA4D.h \ 447 447 modules/DecayFilter.h \ 448 modules/ParticleDensity.h \449 448 modules/ExampleModule.h 450 449 tmp/modules/ModulesDict$(PcmSuf): \ … … 511 510 tmp/classes/DelphesFormula.$(ObjSuf): \ 512 511 classes/DelphesFormula.$(SrcSuf) \ 513 classes/DelphesFormula.h \ 514 classes/DelphesClasses.h 512 classes/DelphesFormula.h 515 513 tmp/classes/DelphesHepMCReader.$(ObjSuf): \ 516 514 classes/DelphesHepMCReader.$(SrcSuf) \ … … 883 881 external/ExRootAnalysis/ExRootFilter.h \ 884 882 external/ExRootAnalysis/ExRootResult.h 885 tmp/modules/ParticleDensity.$(ObjSuf): \886 modules/ParticleDensity.$(SrcSuf) \887 modules/ParticleDensity.h \888 classes/DelphesClasses.h \889 classes/DelphesFactory.h \890 classes/DelphesFormula.h \891 external/ExRootAnalysis/ExRootClassifier.h \892 external/ExRootAnalysis/ExRootFilter.h \893 external/ExRootAnalysis/ExRootResult.h894 883 tmp/modules/ParticlePropagator.$(ObjSuf): \ 895 884 modules/ParticlePropagator.$(SrcSuf) \ … … 1028 1017 modules/TrackCovariance.h \ 1029 1018 classes/DelphesClasses.h \ 1030 external/TrackCovariance/SolGeom.h \ 1031 external/TrackCovariance/SolGridCov.h \ 1032 external/TrackCovariance/ObsTrk.h 1019 external/TrackCovariance/SolGeom.h 1033 1020 tmp/modules/TrackPileUpSubtractor.$(ObjSuf): \ 1034 1021 modules/TrackPileUpSubtractor.$(SrcSuf) \ … … 1187 1174 tmp/modules/MomentumSmearing.$(ObjSuf) \ 1188 1175 tmp/modules/OldCalorimeter.$(ObjSuf) \ 1189 tmp/modules/ParticleDensity.$(ObjSuf) \1190 1176 tmp/modules/ParticlePropagator.$(ObjSuf) \ 1191 1177 tmp/modules/PdgCodeFilter.$(ObjSuf) \ … … 2276 2262 @touch $@ 2277 2263 2278 modules/ParticleDensity.h: \2279 classes/DelphesModule.h2280 @touch $@2281 2282 2264 modules/TimeSmearing.h: \ 2283 2265 classes/DelphesModule.h -
classes/DelphesClasses.cc
r7c5b8f3 r288a5fc 172 172 ExclYmerge45(0), 173 173 ExclYmerge56(0), 174 ParticleDensity(0),175 174 fFactory(0), 176 175 fArray(0) -
classes/DelphesClasses.h
r7c5b8f3 r288a5fc 733 733 Double_t ExclYmerge56; 734 734 735 // event characteristics variables736 Double_t ParticleDensity; // particle multiplicity density in the proximity of the particle737 738 735 static CompBase *fgCompare; //! 739 736 const CompBase *GetCompare() const { return fgCompare; } -
classes/DelphesFormula.cc
r7c5b8f3 r288a5fc 18 18 19 19 #include "classes/DelphesFormula.h" 20 #include "classes/DelphesClasses.h"21 20 22 21 #include "TString.h" … … 64 63 buffer.ReplaceAll("dz", "[1]"); 65 64 buffer.ReplaceAll("ctgTheta", "[2]"); 66 buffer.ReplaceAll("radius", "[3]");67 buffer.ReplaceAll("density", "[4]");68 65 69 66 #if ROOT_VERSION_CODE < ROOT_VERSION(6, 3, 0) … … 80 77 //------------------------------------------------------------------------------ 81 78 82 Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, Double_t energy, Candidate *candidate) 79 Double_t DelphesFormula::Eval(Double_t pt, Double_t eta, Double_t phi, 80 Double_t energy, Double_t d0, Double_t dz, 81 Double_t ctgTheta) 83 82 { 84 85 Double_t d0 = 0., dz = 0., ctgTheta = 0., radius = 0., density = 0.;86 if (candidate) {87 d0 = candidate->D0;88 dz = candidate->DZ;89 ctgTheta = candidate->CtgTheta;90 radius = candidate->Position.Pt();91 density = candidate->ParticleDensity;92 }93 94 83 Double_t x[4] = {pt, eta, phi, energy}; 95 Double_t params[ 5] = {d0, dz, ctgTheta, radius, density};84 Double_t params[3] = {d0, dz, ctgTheta}; 96 85 return EvalPar(x, params); 97 86 } -
classes/DelphesFormula.h
r7c5b8f3 r288a5fc 22 22 #include "TFormula.h" 23 23 24 class Candidate;25 26 24 class DelphesFormula: public TFormula 27 25 { … … 35 33 Int_t Compile(const char *expression); 36 34 37 Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, Double_t energy = 0, Candidate *candidate = nullptr); 35 Double_t Eval(Double_t pt, Double_t eta = 0, Double_t phi = 0, 36 Double_t energy = 0, Double_t d0 = 0, Double_t dz = 0, 37 Double_t ctgTheta = 0); 38 38 }; 39 39 -
modules/AngularSmearing.cc
r7c5b8f3 r288a5fc 112 112 // apply smearing formula for eta,phi 113 113 114 eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e , candidate));115 phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e , candidate));114 eta = gRandom->Gaus(eta, fFormulaEta->Eval(pt, eta, phi, e)); 115 phi = gRandom->Gaus(phi, fFormulaPhi->Eval(pt, eta, phi, e)); 116 116 117 117 if(pt <= 0.0) continue; -
modules/Efficiency.cc
r7c5b8f3 r288a5fc 95 95 { 96 96 Candidate *candidate; 97 Double_t pt, eta, phi, e ;97 Double_t pt, eta, phi, e, d0, dz, ctgTheta; 98 98 99 99 fItInputArray->Reset(); … … 106 106 pt = candidateMomentum.Pt(); 107 107 e = candidateMomentum.E(); 108 108 d0 = candidate->D0; 109 dz = candidate->DZ; 110 ctgTheta = candidate->CtgTheta; 111 109 112 // apply an efficency formula 110 if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, candidate)) continue;113 if(gRandom->Uniform() > fFormula->Eval(pt, eta, phi, e, d0, dz, ctgTheta)) continue; 111 114 112 115 fOutputArray->Add(candidate); -
modules/ModulesLinkDef.h
r7c5b8f3 r288a5fc 74 74 #include "modules/VertexFinderDA4D.h" 75 75 #include "modules/DecayFilter.h" 76 #include "modules/ParticleDensity.h"77 76 #include "modules/ExampleModule.h" 78 77 … … 131 130 #pragma link C++ class VertexFinderDA4D+; 132 131 #pragma link C++ class DecayFilter+; 133 #pragma link C++ class ParticleDensity+;134 132 #pragma link C++ class ExampleModule+; 135 133 -
modules/MomentumSmearing.cc
r7c5b8f3 r288a5fc 106 106 pt = candidateMomentum.Pt(); 107 107 e = candidateMomentum.E(); 108 res = fFormula->Eval(pt, eta, phi, e , candidate);108 res = fFormula->Eval(pt, eta, phi, e); 109 109 110 110 // apply smearing formula -
modules/TrackSmearing.cc
r7c5b8f3 r288a5fc 158 158 TLorentzVector beamSpotPosition; 159 159 Candidate *candidate, *mother; 160 Double_t pt, eta, e,d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi;160 Double_t pt, eta, d0, d0Error, trueD0, dz, dzError, trueDZ, p, pError, trueP, ctgTheta, ctgThetaError, trueCtgTheta, phi, phiError, truePhi; 161 161 Double_t x, y, z, t, px, py, pz, theta; 162 162 Double_t q, r; … … 223 223 pt = momentum.Pt(); 224 224 eta = momentum.Eta(); 225 e = momentum.E(); 226 225 227 226 d0 = trueD0 = candidate->D0; 228 227 dz = trueDZ = candidate->DZ; … … 233 232 234 233 if(fUseD0Formula) 235 d0Error = fD0Formula->Eval(pt, eta , phi, e, candidate);234 d0Error = fD0Formula->Eval(pt, eta); 236 235 else 237 236 { … … 248 247 249 248 if(fUseDZFormula) 250 dzError = fDZFormula->Eval(pt, eta , phi, e, candidate);249 dzError = fDZFormula->Eval(pt, eta); 251 250 else 252 251 { … … 263 262 264 263 if(fUsePFormula) 265 pError = fPFormula->Eval(pt, eta , phi, e, candidate) * p;264 pError = fPFormula->Eval(pt, eta) * p; 266 265 else 267 266 { … … 278 277 279 278 if(fUseCtgThetaFormula) 280 ctgThetaError = fCtgThetaFormula->Eval(pt, eta , phi, e, candidate);279 ctgThetaError = fCtgThetaFormula->Eval(pt, eta); 281 280 else 282 281 { … … 293 292 294 293 if(fUsePhiFormula) 295 phiError = fPhiFormula->Eval(pt, eta , phi, e, candidate);294 phiError = fPhiFormula->Eval(pt, eta); 296 295 else 297 296 {
Note:
See TracChangeset
for help on using the changeset viewer.