Changeset dd514ae in git for classes

Timestamp:

Jun 10, 2015, 4:04:47 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8707eeb

Parents:

6ec8d18 (diff), 9c491e1 (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:

resolve conflict in DelphesClasses.h

Location:

classes

Files:

• DelphesClasses.cc (modified) (8 diffs)
• DelphesClasses.h (modified) (7 diffs)

classes/DelphesClasses.cc

@@ -45 +45 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector GenParticle::P4()
+TLorentzVector GenParticle::P4() const
 {
   TLorentzVector vec;
@@ -54 +54 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector MissingET::P4()
+TLorentzVector MissingET::P4() const
 {
   TLorentzVector vec;
@@ -63 +63 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Photon::P4()
+TLorentzVector Photon::P4() const
 {
   TLorentzVector vec;
@@ -72 +72 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Electron::P4()
+TLorentzVector Electron::P4() const
 {
   TLorentzVector vec;
@@ -81 +81 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Muon::P4()
+TLorentzVector Muon::P4() const
 {
   TLorentzVector vec;
@@ -90 +90 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Jet::P4()
+TLorentzVector Jet::P4() const
 {
   TLorentzVector vec;
@@ -99 +99 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Track::P4()
+TLorentzVector Track::P4() const
 {
   TLorentzVector vec;
@@ -108 +108 @@
 //------------------------------------------------------------------------------
 
-TLorentzVector Tower::P4()
+TLorentzVector Tower::P4() const
 {
   TLorentzVector vec;

classes/DelphesClasses.h

@@ -161 +161 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4();
+  TLorentzVector P4() const;
 
   ClassDef(GenParticle, 1)
@@ -188 +188 @@
   Float_t Phi; // mising energy azimuthal angle
 
-  TLorentzVector P4();
+  TLorentzVector P4() const;
 
   ClassDef(MissingET, 1)
@@ -254 +254 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4();
+  TLorentzVector P4() const;
 
   ClassDef(Photon, 2)
@@ -289 +289 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4();
+  TLorentzVector P4() const;
 
   ClassDef(Electron, 2)
@@ -322 +322 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4();
+  TLorentzVector P4() const;
 
   ClassDef(Muon, 2)
@@ -419 +419 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4();
+  TLorentzVector P4() const;
 
   ClassDef(Track, 2)
@@ -448 +448 @@
   const CompBase *GetCompare() const { return fgCompare; }
 
-  TLorentzVector P4();
+  TLorentzVector P4() const;
 
   ClassDef(Tower, 1)