Fork me on GitHub

Changeset 8d4d51b in git for classes


Ignore:
Timestamp:
Dec 5, 2017, 8:36:29 PM (7 years ago)
Author:
Michele Selvaggi (michele.selvaggi@…>
Branches:
ImprovedOutputFile, Timing, dual_readout, llp, master
Children:
6d1fff5
Parents:
27cd45c (diff), 6965fe1 (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

    r27cd45c r8d4d51b  
    175175  Tau[3] = 0.0;
    176176  Tau[4] = 0.0;
     177
     178  SoftDroppedJet.SetXYZT(0.0, 0.0, 0.0, 0.0);
     179  SoftDroppedSubJet1.SetXYZT(0.0, 0.0, 0.0, 0.0);
     180  SoftDroppedSubJet2.SetXYZT(0.0, 0.0, 0.0, 0.0);
     181
    177182  for(i = 0; i < 5; ++i)
    178183  {
    … …  
    351356  object.NSubJetsSoftDropped = NSubJetsSoftDropped;
    352357
     358  object.SoftDroppedJet =SoftDroppedJet;
     359  object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
     360  object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
     361
    353362  object.fFactory = fFactory;
    354363  object.fArray = 0;
    … …  
    457466  Tau[4] = 0.0;
    458467
     468  SoftDroppedJet.SetXYZT(0.0, 0.0, 0.0, 0.0);
     469  SoftDroppedSubJet1.SetXYZT(0.0, 0.0, 0.0, 0.0);
     470  SoftDroppedSubJet2.SetXYZT(0.0, 0.0, 0.0, 0.0);
     471
     472
    459473  for(i = 0; i < 5; ++i)
    460474  {

  • classes/DelphesClasses.h

    r27cd45c r8d4d51b  
    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
    … …  
    625629  // Other Substructure variables
    626630
     631  TLorentzVector SoftDroppedJet;
     632  TLorentzVector SoftDroppedSubJet1;
     633  TLorentzVector SoftDroppedSubJet2;
     634
    627635  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
    628636  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.