Changes in classes/DelphesClasses.cc [61dccd3:a5af1df] in git

File:

• classes/DelphesClasses.cc (modified) (15 diffs)

classes/DelphesClasses.cc

@@ -28 +28 @@
 
 #include "classes/DelphesClasses.h"
+
 #include "classes/DelphesFactory.h"
 #include "classes/SortableObject.h"
@@ -35 +36 @@
 CompBase *Electron::fgCompare = CompPT<Electron>::Instance();
 CompBase *Muon::fgCompare = CompPT<Muon>::Instance();
+
 CompBase *Jet::fgCompare = CompPT<Jet>::Instance();
 CompBase *Track::fgCompare = CompPT<Track>::Instance();
 CompBase *Tower::fgCompare = CompE<Tower>::Instance();
-CompBase *ParticleFlowCandidate::fgCompare = CompE<ParticleFlowCandidate>::Instance();
 CompBase *HectorHit::fgCompare = CompE<HectorHit>::Instance();
 CompBase *Vertex::fgCompare = CompSumPT2<Vertex>::Instance();
 CompBase *Candidate::fgCompare = CompMomentumPt<Candidate>::Instance();
+CompBase *CscCluster::fgCompare = CompE<CscCluster>::Instance();
 
 //------------------------------------------------------------------------------
@@ -102 +104 @@
 {
   TLorentzVector vec;
-  vec.SetPtEtaPhiM(PT, Eta, Phi, Mass);
-  return vec;
-}
-
-//------------------------------------------------------------------------------
-
-TMatrixDSym Track::CovarianceMatrix() const
-{
-  TMatrixDSym Cv;
-  Cv.ResizeTo(5, 5);
-
-  // convert diagonal term to original units
-  Cv(0, 0)=TMath::Power(ErrorD0, 2.);
-  Cv(1, 1)=TMath::Power(ErrorPhi, 2.);
-  Cv(2, 2)=TMath::Power(ErrorC, 2.);
-  Cv(3, 3)=TMath::Power(ErrorDZ, 2.);
-  Cv(4, 4)=TMath::Power(ErrorCtgTheta, 2.);
-
-  // off diagonal terms
-  Cv(0, 1)=ErrorD0Phi;
-  Cv(0, 2)=ErrorD0C;
-  Cv(0, 3)=ErrorD0DZ;
-  Cv(0, 4)=ErrorD0CtgTheta;
-  Cv(1, 2)=ErrorPhiC;
-  Cv(1, 3)=ErrorPhiDZ;
-  Cv(1, 4)=ErrorPhiCtgTheta;
-  Cv(2, 3)=ErrorCDZ;
-  Cv(2, 4)=ErrorCCtgTheta;
-  Cv(3, 4)=ErrorDZCtgTheta;
-
-  Cv(1, 0)=Cv(0, 1);
-  Cv(2, 0)=Cv(0, 2);
-  Cv(3, 0)=Cv(0, 3);
-  Cv(4, 0)=Cv(0, 4);
-  Cv(2, 1)=Cv(1, 2);
-  Cv(3, 1)=Cv(1, 3);
-  Cv(4, 1)=Cv(1, 4);
-  Cv(3, 2)=Cv(2, 3);
-  Cv(4, 2)=Cv(2, 4);
-  Cv(4, 3)=Cv(3, 4);
-
-  return Cv;
-}
-
+  vec.SetPtEtaPhiM(PT, Eta, Phi, 0.0);
+  return vec;
+}
 
 //------------------------------------------------------------------------------
@@ -154 +115 @@
   vec.SetPtEtaPhiM(ET, Eta, Phi, 0.0);
   return vec;
-}
-
-//------------------------------------------------------------------------------
-
-TLorentzVector ParticleFlowCandidate::P4() const
-{
-  TLorentzVector vec;
-  vec.SetPtEtaPhiM(PT, Eta, Phi, Mass);
-  return vec;
-}
-
-//------------------------------------------------------------------------------
-
-TMatrixDSym ParticleFlowCandidate::CovarianceMatrix() const
-{
-  TMatrixDSym Cv;
-  Cv.ResizeTo(5, 5);
-
-  // convert diagonal term to original units
-  Cv(0, 0)=TMath::Power(ErrorD0, 2.);
-  Cv(1, 1)=TMath::Power(ErrorPhi, 2.);
-  Cv(2, 2)=TMath::Power(ErrorC, 2.);
-  Cv(3, 3)=TMath::Power(ErrorDZ, 2.);
-  Cv(4, 4)=TMath::Power(ErrorCtgTheta, 2.);
-
-  // off diagonal terms
-  Cv(0, 1)=ErrorD0Phi;
-  Cv(0, 2)=ErrorD0C;
-  Cv(0, 3)=ErrorD0DZ;
-  Cv(0, 4)=ErrorD0CtgTheta;
-  Cv(1, 2)=ErrorPhiC;
-  Cv(1, 3)=ErrorPhiDZ;
-  Cv(1, 4)=ErrorPhiCtgTheta;
-  Cv(2, 3)=ErrorCDZ;
-  Cv(2, 4)=ErrorCCtgTheta;
-  Cv(3, 4)=ErrorDZCtgTheta;
-
-  Cv(1, 0)=Cv(0, 1);
-  Cv(2, 0)=Cv(0, 2);
-  Cv(3, 0)=Cv(0, 3);
-  Cv(4, 0)=Cv(0, 4);
-  Cv(2, 1)=Cv(1, 2);
-  Cv(3, 1)=Cv(1, 3);
-  Cv(4, 1)=Cv(1, 4);
-  Cv(3, 2)=Cv(2, 3);
-  Cv(4, 2)=Cv(2, 4);
-  Cv(4, 3)=Cv(3, 4);
-
-  return Cv;
 }
 
@@ -213 +125 @@
   Flavor(0), FlavorAlgo(0), FlavorPhys(0),
   BTag(0), BTagAlgo(0), BTagPhys(0),
-  TauTag(0), TauWeight(0.0), Eem(0.0), Ehad(0.0), Etrk(0.0),
+  TauTag(0), TauWeight(0.0), Eem(0.0), Ehad(0.0),
   DeltaEta(0.0), DeltaPhi(0.0),
   Momentum(0.0, 0.0, 0.0, 0.0),
   Position(0.0, 0.0, 0.0, 0.0),
   InitialPosition(0.0, 0.0, 0.0, 0.0),
+  DecayPosition(0.0, 0.0, 0.0, 0.0),
   PositionError(0.0, 0.0, 0.0, 0.0),
   Area(0.0, 0.0, 0.0, 0.0),
-  TrackCovariance(5),
   L(0),
   D0(0), ErrorD0(0),
   DZ(0), ErrorDZ(0),
   P(0), ErrorP(0),
-  C(0), ErrorC(0),
   PT(0), ErrorPT(0),
   CtgTheta(0), ErrorCtgTheta(0),
   Phi(0), ErrorPhi(0),
   Xd(0), Yd(0), Zd(0),
-  Nclusters(0.0),
-  dNdx(0.0),
   TrackResolution(0),
   NCharged(0),
   NNeutrals(0),
-  NeutralEnergyFraction(0),  // charged energy fraction
-  ChargedEnergyFraction(0),  // neutral energy fraction
   Beta(0),
   BetaStar(0),
@@ -256 +163 @@
   ExclYmerge45(0),
   ExclYmerge56(0),
-  ParticleDensity(0),
   fFactory(0),
   fArray(0)
@@ -378 +284 @@
   object.Eem = Eem;
   object.Ehad = Ehad;
-  object.Etrk = Etrk;
   object.Edges[0] = Edges[0];
   object.Edges[1] = Edges[1];
@@ -388 +293 @@
   object.Position = Position;
   object.InitialPosition = InitialPosition;
+  object.DecayPosition = DecayPosition;
   object.PositionError = PositionError;
   object.Area = Area;
@@ -398 +304 @@
   object.P = P;
   object.ErrorP = ErrorP;
-  object.C = C;
-  object.ErrorC = ErrorC;
   object.PT = PT;
   object.ErrorPT = ErrorPT;
@@ -409 +313 @@
   object.Yd = Yd;
   object.Zd = Zd;
-  object.Nclusters = Nclusters;
-  object.dNdx = dNdx;
   object.TrackResolution = TrackResolution;
   object.NCharged = NCharged;
   object.NNeutrals = NNeutrals;
-  object.NeutralEnergyFraction = NeutralEnergyFraction;
-  object.ChargedEnergyFraction = ChargedEnergyFraction;
   object.Beta = Beta;
   object.BetaStar = BetaStar;
@@ -466 +366 @@
   object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
   object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
-  object.TrackCovariance = TrackCovariance;
+
   object.fFactory = fFactory;
   object.fArray = 0;
@@ -513 +413 @@
   Eem = 0.0;
   Ehad = 0.0;
-  Etrk = 0.0;
   Edges[0] = 0.0;
   Edges[1] = 0.0;
@@ -523 +422 @@
   Position.SetXYZT(0.0, 0.0, 0.0, 0.0);
   InitialPosition.SetXYZT(0.0, 0.0, 0.0, 0.0);
+  DecayPosition.SetXYZT(0.0, 0.0, 0.0, 0.0);
   Area.SetXYZT(0.0, 0.0, 0.0, 0.0);
-  TrackCovariance.Zero();
   L = 0.0;
   ErrorT = 0.0;
@@ -533 +432 @@
   P = 0.0;
   ErrorP = 0.0;
-  C = 0.0;
-  ErrorC = 0.0;
   PT = 0.0;
   ErrorPT = 0.0;
@@ -544 +441 @@
   Yd = 0.0;
   Zd = 0.0;
-  Nclusters = 0.0;
-  dNdx = 0.0;
   TrackResolution = 0.0;
   NCharged = 0;