Fork me on GitHub

Changeset 5a69ba1d in git for classes


Ignore:
Timestamp:
01/12/18 17:43:01 (3 years ago)
Author:
Ulrike Schnoor <schnooru@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
3037765
Parents:
ae061c1 (diff), 1f7223c (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 'master' of github.com:delphes/delphes

Location:
classes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • classes/DelphesClasses.cc

    rae061c1 r5a69ba1d  
    179179  Tau[3] = 0.0;
    180180  Tau[4] = 0.0;
     181
     182  SoftDroppedJet.SetXYZT(0.0, 0.0, 0.0, 0.0);
     183  SoftDroppedSubJet1.SetXYZT(0.0, 0.0, 0.0, 0.0);
     184  SoftDroppedSubJet2.SetXYZT(0.0, 0.0, 0.0, 0.0);
     185
    181186  for(i = 0; i < 5; ++i)
    182187  {
     
    355360  object.NSubJetsSoftDropped = NSubJetsSoftDropped;
    356361
     362  object.SoftDroppedJet =SoftDroppedJet;
     363  object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
     364  object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
     365
    357366  object.fFactory = fFactory;
    358367  object.fArray = 0;
     
    461470  Tau[4] = 0.0;
    462471
     472  SoftDroppedJet.SetXYZT(0.0, 0.0, 0.0, 0.0);
     473  SoftDroppedSubJet1.SetXYZT(0.0, 0.0, 0.0, 0.0);
     474  SoftDroppedSubJet2.SetXYZT(0.0, 0.0, 0.0, 0.0);
     475
     476
    463477  for(i = 0; i < 5; ++i)
    464478  {
  • classes/DelphesClasses.h

    rae061c1 r5a69ba1d  
    388388  Float_t Tau[5]; // N-subjettiness
    389389
     390  TLorentzVector SoftDroppedJet;
     391  TLorentzVector SoftDroppedSubJet1;
     392  TLorentzVector SoftDroppedSubJet2;
     393
    390394  TLorentzVector TrimmedP4[5]; // first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
    391395  TLorentzVector PrunedP4[5]; // first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
     
    631635  // Other Substructure variables
    632636
     637  TLorentzVector SoftDroppedJet;
     638  TLorentzVector SoftDroppedSubJet1;
     639  TLorentzVector SoftDroppedSubJet2;
     640
    633641  TLorentzVector TrimmedP4[5]; // first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
    634642  TLorentzVector PrunedP4[5]; // first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
Note: See TracChangeset for help on using the changeset viewer.