Fork me on GitHub

Changeset dd514ae in git for classes/DelphesClasses.h


Ignore:
Timestamp:
06/10/15 16:04:47 (5 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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesClasses.h

    r6ec8d18 rdd514ae  
    161161  const CompBase *GetCompare() const { return fgCompare; }
    162162
    163   TLorentzVector P4();
     163  TLorentzVector P4() const;
    164164
    165165  ClassDef(GenParticle, 1)
     
    188188  Float_t Phi; // mising energy azimuthal angle
    189189
    190   TLorentzVector P4();
     190  TLorentzVector P4() const;
    191191
    192192  ClassDef(MissingET, 1)
     
    254254  const CompBase *GetCompare() const { return fgCompare; }
    255255
    256   TLorentzVector P4();
     256  TLorentzVector P4() const;
    257257
    258258  ClassDef(Photon, 2)
     
    289289  const CompBase *GetCompare() const { return fgCompare; }
    290290
    291   TLorentzVector P4();
     291  TLorentzVector P4() const;
    292292
    293293  ClassDef(Electron, 2)
     
    322322  const CompBase *GetCompare() const { return fgCompare; }
    323323
    324   TLorentzVector P4();
     324  TLorentzVector P4() const;
    325325
    326326  ClassDef(Muon, 2)
     
    419419  const CompBase *GetCompare() const { return fgCompare; }
    420420
    421   TLorentzVector P4();
     421  TLorentzVector P4() const;
    422422
    423423  ClassDef(Track, 2)
     
    448448  const CompBase *GetCompare() const { return fgCompare; }
    449449
    450   TLorentzVector P4();
     450  TLorentzVector P4() const;
    451451
    452452  ClassDef(Tower, 1)
Note: See TracChangeset for help on using the changeset viewer.