Browse Source

first commit

Nikita Ermakov 2 years ago
parent
commit
f1a3aed3ae
100 changed files with 407 additions and 7489 deletions
  1. 0 326
      StRoot/StFemtoDstMaker/#StFemtoTrack.cxx#
  2. BIN
      StRoot/StFemtoDstMaker/.StFemtoDstInclusiveSelector.cxx.un~
  3. BIN
      StRoot/StFemtoDstMaker/.StFemtoDstMaker.cxx.un~
  4. BIN
      StRoot/StFemtoDstMaker/.StFemtoDstMaker.h.un~
  5. BIN
      StRoot/StFemtoDstMaker/.StFemtoDstQAMaker.cxx.un~
  6. BIN
      StRoot/StFemtoDstMaker/.StFemtoDstQAMaker.h.un~
  7. BIN
      StRoot/StFemtoDstMaker/.StFemtoEvent.h.un~
  8. BIN
      StRoot/StFemtoDstMaker/.StFemtoTrack.h.un~
  9. 0 56
      StRoot/StFemtoDstMaker/Oscar97Event.cxx
  10. 0 51
      StRoot/StFemtoDstMaker/Oscar97Event.h
  11. 0 55
      StRoot/StFemtoDstMaker/Oscar97Track.cxx
  12. 0 71
      StRoot/StFemtoDstMaker/Oscar97Track.h
  13. 1 4
      StRoot/StFemtoDstMaker/StFemtoDstInclusiveSelector.cxx
  14. 0 2
      StRoot/StFemtoDstMaker/StFemtoDstInclusiveSelector.h
  15. 23 10
      StRoot/StFemtoDstMaker/StFemtoDstPythia6Maker.cxx
  16. 30 22
      StRoot/StFemtoDstMaker/StFemtoEvent.cxx
  17. 1 1
      StRoot/StFemtoDstMaker/StFemtoEvent.h
  18. 2 2
      StRoot/StFemtoDstMaker/StHbtFemtoDstReader.cxx
  19. 4 4
      StRoot/StFemtoDstMaker/StHbtO97DstReader.cxx
  20. BIN
      StRoot/StFlow/.StFlow.cxx.un~
  21. BIN
      StRoot/StFlow/.StFlow.h.un~
  22. 3 3
      StRoot/StHbtMaker/.consign
  23. 21 21
      StRoot/StHbtMaker/Base/.consign
  24. 52 45
      StRoot/StHbtMaker/CorrFctn/.consign
  25. 1 1
      StRoot/StHbtMaker/CorrFctn/QinvCorrFctnKt_MomCons.h
  26. 65 55
      StRoot/StHbtMaker/Cut/.consign
  27. 9 17
      StRoot/StHbtMaker/Cut/fxtEventCutMonitor.cxx
  28. 4 4
      StRoot/StHbtMaker/Cut/fxtTrackCutMonitor.cxx
  29. 4 5
      StRoot/StHbtMaker/Cut/fxtTrackCutMonitor.h
  30. 2 2
      StRoot/StHbtMaker/Cut/gregsEventCut.cxx
  31. 2 2
      StRoot/StHbtMaker/Fit/.consign
  32. 63 63
      StRoot/StHbtMaker/Infrastructure/.consign
  33. 1 5
      StRoot/StHbtMaker/Infrastructure/StHbtAnalysis.cxx
  34. 22 35
      StRoot/StHbtMaker/Infrastructure/StHbtTrack.cc
  35. 15 16
      StRoot/StHbtMaker/Infrastructure/StHbtTrack.hh
  36. 5 4
      StRoot/StHbtMaker/Infrastructure/StHbtV0.cc
  37. 6 6
      StRoot/StHbtMaker/Infrastructure/StHbtV0.hh
  38. 18 16
      StRoot/StHbtMaker/Reader/.consign
  39. 4 4
      StRoot/StHbtMaker/Reader/StHbtPythia6DstReader.cxx
  40. 23 22
      StRoot/StHbtMaker/Reader/gregsStHbtMuDstReader.cxx
  41. 2 3
      StRoot/StHbtMaker/Reader/gregsStHbtMuDstReader.h
  42. 22 22
      StRoot/StHbtMaker/ThCorrFctn/.consign
  43. 0 363
      StRoot/StHbtMaker/ThCorrFctn/FsiTools.F
  44. 0 1540
      StRoot/StHbtMaker/ThCorrFctn/FsiWeightLednicky2.F
  45. 1 0
      StRoot/StHbtMaker/ThLednickyWeight/.consign
  46. 1 1
      StRoot/StHbtMaker/doc/Make/.consign
  47. 0 3
      StRoot/StHbtMaker_alpha/.consign
  48. 0 21
      StRoot/StHbtMaker_alpha/Base/.consign
  49. 0 28
      StRoot/StHbtMaker_alpha/Base/CVS/Entries
  50. 0 1
      StRoot/StHbtMaker_alpha/Base/CVS/Repository
  51. 0 1
      StRoot/StHbtMaker_alpha/Base/CVS/Root
  52. 0 56
      StRoot/StHbtMaker_alpha/Base/StHbtBaseAnalysis.h
  53. 0 113
      StRoot/StHbtMaker_alpha/Base/StHbtCorrFctn.hh
  54. 0 77
      StRoot/StHbtMaker_alpha/Base/StHbtCutMonitor.hh
  55. 0 105
      StRoot/StHbtMaker_alpha/Base/StHbtEventCut.h
  56. 0 94
      StRoot/StHbtMaker_alpha/Base/StHbtEventReader.cc
  57. 0 135
      StRoot/StHbtMaker_alpha/Base/StHbtEventReader.hh
  58. 0 20
      StRoot/StHbtMaker_alpha/Base/StHbtEventWriter.hh
  59. 0 30
      StRoot/StHbtMaker_alpha/Base/StHbtFsiWeight.cc
  60. 0 45
      StRoot/StHbtMaker_alpha/Base/StHbtFsiWeight.hh
  61. 0 40
      StRoot/StHbtMaker_alpha/Base/StHbtHiddenInfo.hh
  62. 0 49
      StRoot/StHbtMaker_alpha/Base/StHbtKinkCut.h
  63. 0 41
      StRoot/StHbtMaker_alpha/Base/StHbtLikeSignCorrFctn.hh
  64. 0 119
      StRoot/StHbtMaker_alpha/Base/StHbtPairCut.h
  65. 0 124
      StRoot/StHbtMaker_alpha/Base/StHbtParticleCut.h
  66. 0 114
      StRoot/StHbtMaker_alpha/Base/StHbtRoot1DCF.cc
  67. 0 70
      StRoot/StHbtMaker_alpha/Base/StHbtRoot1DCF.hh
  68. 0 116
      StRoot/StHbtMaker_alpha/Base/StHbtRoot2DCF.cc
  69. 0 68
      StRoot/StHbtMaker_alpha/Base/StHbtRoot2DCF.hh
  70. 0 117
      StRoot/StHbtMaker_alpha/Base/StHbtRoot3DCF.cc
  71. 0 71
      StRoot/StHbtMaker_alpha/Base/StHbtRoot3DCF.hh
  72. 0 57
      StRoot/StHbtMaker_alpha/Base/StHbtThCorrFctn.hh
  73. 0 279
      StRoot/StHbtMaker_alpha/Base/StHbtThPair.cc
  74. 0 324
      StRoot/StHbtMaker_alpha/Base/StHbtThPair.hh
  75. 0 48
      StRoot/StHbtMaker_alpha/Base/StHbtTrackCut.h
  76. 0 72
      StRoot/StHbtMaker_alpha/Base/StHbtTripletCut.h
  77. 0 46
      StRoot/StHbtMaker_alpha/Base/StHbtV0Cut.h
  78. 0 46
      StRoot/StHbtMaker_alpha/Base/StHbtXiCut.h
  79. 0 16
      StRoot/StHbtMaker_alpha/CVS/Entries
  80. 0 1
      StRoot/StHbtMaker_alpha/CVS/Repository
  81. 0 1
      StRoot/StHbtMaker_alpha/CVS/Root
  82. 0 131
      StRoot/StHbtMaker_alpha/CorrFctn/#QinvCorrFctn.cxx#
  83. 0 45
      StRoot/StHbtMaker_alpha/CorrFctn/.consign
  84. 0 0
      StRoot/StHbtMaker_alpha/CorrFctn/0
  85. 0 111
      StRoot/StHbtMaker_alpha/CorrFctn/AverageSepCorrFctn.cxx
  86. 0 60
      StRoot/StHbtMaker_alpha/CorrFctn/AverageSepCorrFctn.h
  87. 0 366
      StRoot/StHbtMaker_alpha/CorrFctn/BPLCMSFrame3DCorrFctn.cxx
  88. 0 143
      StRoot/StHbtMaker_alpha/CorrFctn/BPLCMSFrame3DCorrFctn.h
  89. 0 207
      StRoot/StHbtMaker_alpha/CorrFctn/BPLCMSFrame3DCorrFctnKt.cxx
  90. 0 97
      StRoot/StHbtMaker_alpha/CorrFctn/BPLCMSFrame3DCorrFctnKt.h
  91. 0 280
      StRoot/StHbtMaker_alpha/CorrFctn/BPLCMSFrame3DCorrFctn_SIM.cxx
  92. 0 146
      StRoot/StHbtMaker_alpha/CorrFctn/BPLCMSFrame3DCorrFctn_SIM.h
  93. 0 161
      StRoot/StHbtMaker_alpha/CorrFctn/BPLabFrame3DCorrFctn.cxx
  94. 0 93
      StRoot/StHbtMaker_alpha/CorrFctn/BPLabFrame3DCorrFctn.h
  95. 0 83
      StRoot/StHbtMaker_alpha/CorrFctn/CVS/Entries
  96. 0 1
      StRoot/StHbtMaker_alpha/CorrFctn/CVS/Repository
  97. 0 1
      StRoot/StHbtMaker_alpha/CorrFctn/CVS/Root
  98. 0 97
      StRoot/StHbtMaker_alpha/CorrFctn/EntSep_pTCorrFctn.cxx
  99. 0 60
      StRoot/StHbtMaker_alpha/CorrFctn/EntSep_pTCorrFctn.h
  100. 0 0
      StRoot/StHbtMaker_alpha/CorrFctn/EntranceSepCorrFctn.cxx

+ 0 - 326
StRoot/StFemtoDstMaker/#StFemtoTrack.cxx#

@@ -1,326 +0,0 @@
-#include "StFemtoTrack.h"
-#include "TMath.h"
-
-ClassImp(StFemtoTrack)
-
-//_________________
-StFemtoTrack::StFemtoTrack() {
-
-  mId = -999;
-  mNSigmaElectron = -999;
-  mNSigmaPion = -999;
-  mNSigmaKaon = -999;
-  mNSigmaProton = -999;
-  mDedx = 0;
-  mMomX = 0.;
-  mMomY = 0.;
-  mMomZ = 0.;
-  mBeta = -999.;
-}
-
-//_________________
-StFemtoTrack::StFemtoTrack(Float_t px, Float_t py, Float_t pz) {
-  mId = -999;
-  mNSigmaElectron = -999;
-  mNSigmaPion = -999;
-  mNSigmaKaon = -999;
-  mNSigmaProton = -999;
-  mDedx = 0;
-  mMomX = px;
-  mMomY = py;
-  mMomZ = pz;
-  mBeta = -999.;
-}
-
-//_________________
-StFemtoTrack::~StFemtoTrack() {
-  /* nothing to do*/
-}
-
-//_________________
-Bool_t StFemtoTrack::GetIsTofTrack() {
-
-  Bool_t mIsTofTrack = false;
-  if(mBeta < -1.) {
-    mIsTofTrack = false;
-  }
-  else {
-    mIsTofTrack = true;
-  }
-  return mIsTofTrack;
-}
-
-//_________________
-void StFemtoTrack::SetChi2(Float_t chi2) {
-
-  if( (chi2 * __SCALE__) > USHORTMAX ) {
-    mChi2 = USHORTMAX;
-  }
-  else {
-    mChi2 = (UShort_t) (chi2 * __SCALE__);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetP(Float_t px, Float_t py, Float_t pz) {
-
-  mMomX = px;
-  mMomY = py;
-  mMomZ = pz;
-}
-
-//_________________
-TVector3 StFemtoTrack::GetP() const {
-
-  TVector3 p(mMomX, mMomY, mMomZ);
-  return p;
-}
-
-//_________________
-Float_t StFemtoTrack::GetPt() const {
-
-  return TMath::Sqrt(mMomX*mMomX + mMomY*mMomY);
-}
-
-//_________________
-Float_t StFemtoTrack::GetPtot() const {
-
-  return TMath::Sqrt(mMomX*mMomX + mMomY*mMomY + mMomZ*mMomZ);
-}
-
-//_________________
-Float_t StFemtoTrack::GetEta() const {
-
-  float ptot = TMath::Sqrt(mMomX*mMomX + mMomY*mMomY + mMomZ*mMomZ);
-  float eta = 0.5*TMath::Log( (ptot + mMomZ) / (ptot - mMomZ));
-  return eta;
-}
-
-//_________________
-void StFemtoTrack::SetGlobalP(Float_t px, Float_t py, Float_t pz) {
-
-  mGlobMomX = px;
-  mGlobMomY = py;
-  mGlobMomZ = pz;
-}
-
-//_________________
-TVector3 StFemtoTrack::GetGlobalP() const {
-  
-  TVector3 p( mGlobMomX, mGlobMomY, mGlobMomZ );
-  return p;
-}
-
-//_________________
-Float_t StFemtoTrack::GetPtGlobal() const {
-
-  return TMath::Sqrt(mGlobMomX*mGlobMomX + mGlobMomY*mGlobMomY);
-}
-
-//_________________
-Float_t StFemtoTrack::GetPtotGlobal() const {
-  return TMath::Sqrt(mGlobMomX*mGlobMomX + mGlobMomY*mGlobMomY + mGlobMomZ*mGlobMomZ);
-}
-
-//_________________
-Float_t StFemtoTrack::GetMassSqr() const {
-
-  float mSqr = -999.;
-  if(mBeta > 0.) {
-    float ptot = TMath::Sqrt(mMomX*mMomX + mMomY*mMomY + mMomZ*mMomZ);
-    mSqr = ptot*ptot * (1./(mBeta*mBeta) - 1.);
-  }
-
-  return mSqr;
-}
-
-//_________________
-void StFemtoTrack::SetNSigmaElectron(Float_t ns) {
-
-  if(TMath::Abs(ns*1000) >= SHORTMAX) {
-    if(ns>0) {
-      mNSigmaElectron = SHORTMAX;
-    }
-    else {
-      mNSigmaElectron = -SHORTMAX;
-    }
-  }
-  else {
-    mNSigmaElectron = (Short_t)(ns*1000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetNSigmaPion(Float_t ns) {
-
-  if(TMath::Abs(ns*1000) >= SHORTMAX) {
-    if(ns>0) {
-      mNSigmaPion = SHORTMAX;
-    }
-    else {
-      mNSigmaPion = -SHORTMAX;
-    }
-  }
-  else {
-    mNSigmaPion = (Short_t)(ns*1000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetNSigmaKaon(Float_t ns) {
-
-  if(TMath::Abs(ns*1000) >= SHORTMAX) {
-    if(ns>0) {
-      mNSigmaKaon = SHORTMAX;
-    }
-    else {
-      mNSigmaKaon = -SHORTMAX;
-    }
-  }
-  else {
-    mNSigmaKaon = (Short_t)(ns*1000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetNSigmaProton(Float_t ns) {
-
-  if(TMath::Abs(ns*1000) >= SHORTMAX) {
-    if(ns>0) {
-      mNSigmaProton = SHORTMAX;
-    }
-    else {
-      mNSigmaProton = -SHORTMAX;
-    }
-  }
-  else {
-    mNSigmaProton = (Short_t)(ns*1000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetDCAxGlobal(Float_t x) {
-
-  if(TMath::Abs(x*10000) >= SHORTMAX) {
-    if(x>0) {
-      mDCAxGlobal = SHORTMAX;
-    }
-    else {
-      mDCAxGlobal = -SHORTMAX;
-    }
-  }
-  else {
-    mDCAxGlobal = (Short_t)(x * 10000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetDCAyGlobal(Float_t y) {
-
-  if(TMath::Abs(y*10000) >= SHORTMAX) {
-    if(y>0) {
-      mDCAyGlobal = SHORTMAX;
-    }
-    else {
-      mDCAyGlobal = -SHORTMAX;
-    }
-  }
-  else {
-    mDCAyGlobal = (Short_t)(y * 10000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetDCAzGlobal(Float_t z) {
-
-  if(TMath::Abs(z*10000) >= SHORTMAX) {
-    if(z>0) {
-      mDCAzGlobal = SHORTMAX;
-    }
-    else {
-      mDCAzGlobal = -SHORTMAX;
-    }
-  }
-  else {
-    mDCAzGlobal = (Short_t)(z * 10000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetDCAGlobal(Float_t x, Float_t y, Float_t z) {
-
-  if(TMath::Abs(x*10000) >= SHORTMAX) {
-    if(x>0) {
-      mDCAxGlobal = SHORTMAX;
-    }
-    else {
-      mDCAxGlobal = -SHORTMAX;
-    }
-  }
-  else {
-    mDCAxGlobal = (Short_t)(x * 10000);
-  }
-
-  if(TMath::Abs(y*10000) >= SHORTMAX) {
-    if(y>0) {
-      mDCAyGlobal = SHORTMAX;
-    }
-    else {
-      mDCAyGlobal = -SHORTMAX;
-    }
-  }
-  else {
-    mDCAyGlobal = (Short_t)(y * 10000);
-  }
-
-  if(TMath::Abs(z*10000) >= SHORTMAX) {
-    if(z>0) {
-      mDCAzGlobal = SHORTMAX;
-    }
-    else {
-      mDCAzGlobal = -SHORTMAX;
-    }
-  }
-  else {
-    mDCAzGlobal = (Short_t)(z * 10000);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetDedx(Float_t dEdx) {
-
-  if(dEdx >= USHORTMAX) {
-    mDedx = USHORTMAX;
-  }
-  else {
-    mDedx = (UShort_t)(dEdx * 1e9);
-  }
-}
-
-//_________________
-void StFemtoTrack::SetDedx(Double_t dEdx) {
-
-  if(dEdx >= USHORTMAX) {
-    mDedx = USHORTMAX;
-  }
-  else {
-    mDedx = (UShort_t)(dEdx * 1e9);
-  }
-}
-
-//_________________
-Float_t StFemtoTrack::GetDCAxyGlobal() const {
-
-  Float_t x = (Float_t)mDCAxGlobal * 0.0001;
-  Float_t y = (Float_t)mDCAyGlobal * 0.0001;
-  return TMath::Sqrt(x*x + y*y);
-}
-
-//_________________
-Float_t StFemtoTrack::GetDCAGlobal() const {
-
-  Float_t x = (Float_t)mDCAxGlobal * 0.0001;
-  Float_t y = (Float_t)mDCAyGlobal * 0.0001;
-  Float_t z = (Float_t)mDCAzGlobal * 0.0001;
-  return TMath::Sqrt(x*x + y*y + z*z);
-}

BIN
StRoot/StFemtoDstMaker/.StFemtoDstInclusiveSelector.cxx.un~


BIN
StRoot/StFemtoDstMaker/.StFemtoDstMaker.cxx.un~


BIN
StRoot/StFemtoDstMaker/.StFemtoDstMaker.h.un~


BIN
StRoot/StFemtoDstMaker/.StFemtoDstQAMaker.cxx.un~


BIN
StRoot/StFemtoDstMaker/.StFemtoDstQAMaker.h.un~


BIN
StRoot/StFemtoDstMaker/.StFemtoEvent.h.un~


BIN
StRoot/StFemtoDstMaker/.StFemtoTrack.h.un~


+ 0 - 56
StRoot/StFemtoDstMaker/Oscar97Event.cxx

@@ -1,56 +0,0 @@
-#include "Oscar97Event.h"
-
-
-ClassImp(Oscar97Event)
-
-
-//_________________
-Oscar97Event::Oscar97Event() :
-mEventNumber(0), mNTracks(0), mImpactPar(0.), 
-  mEventPlaneRot(0.) {
-  mTrack = new TClonesArray("Oscar97Track", 1500);
-}
-
-
-//_________________
-Oscar97Event::~Oscar97Event() {
-  if (mTrack) {
-    delete mTrack;
-    mTrack = 0;
-  }
-}
-
-
-//_________________
-Oscar97Event &Oscar97Event::operator=(const Oscar97Event &event) {
-  if (this != &event) {
-    mEventNumber = event.mEventNumber;
-    mNTracks = event.mNTracks;
-    mImpactPar = event.mImpactPar;
-    mEventPlaneRot = event.mEventPlaneRot;
-
-    mTrack = event.mTrack;
-  }
-
-  return *this;
-}
-
-
-//_________________
-Oscar97Track *Oscar97Event::AddTrack(Int_t trackNum) {
-  //
-  // Add a new track
-  //
-  return new ((*mTrack)[trackNum]) Oscar97Track;
-}
-
-
-
-//_________________
-void Oscar97Event::Clear(Option_t* option) {
-  mEventNumber = 0;
-  mNTracks = 0;
-  mImpactPar = 0.;
-  mEventPlaneRot = 0.;
-  mTrack->Delete();
-}

+ 0 - 51
StRoot/StFemtoDstMaker/Oscar97Event.h

@@ -1,51 +0,0 @@
-#ifndef Oscar97Event_h
-#define Oscar97Event_h
-
-#include <TObject.h>
-#include <TClonesArray.h>
-#include <TRef.h>
-#include <TH1.h>
-#include <TBits.h>
-#include "Oscar97Track.h"
-
-
-//_________________
-class Oscar97Event : public TObject {
-  
- private:
-
-  Int_t mEventNumber;     // number of event
-  Int_t mNTracks;         // number of tracks
-  Float_t mImpactPar;     // Impact parameter (fm/c)
-  Float_t mEventPlaneRot; // Rotation of the event plane 
-                          // (fixed to 0. in UrQMD)
-  TClonesArray *mTrack;
-
- public:
-  
-  Oscar97Event();
-  Oscar97Event &operator=(const Oscar97Event &event);
-  ~Oscar97Event();
-  void Clear(Option_t* option= "");
-  Oscar97Track *AddTrack(Int_t trackNum);
-  //
-  // Get methods
-  // 
-  Int_t         GetEventNumber()   { return mEventNumber; }
-  Int_t         GetNTracks()       { return mNTracks; }
-  Float_t       GetImpactPar()     { return mImpactPar; }
-  Float_t       GetEventPlaneRot() { return mEventPlaneRot; }
-  TClonesArray *GetTracks()        { return mTrack; }
-  //
-  // Set methods
-  //
-  void SetEventNumber(Int_t eventNumber) { mEventNumber = eventNumber; }
-  void SetNTracks(Int_t nTracks)         { mNTracks = nTracks; }
-  void SetImpactPar(Float_t impPar)      { mImpactPar = impPar; }
-  void SetEventPlaneRot(Float_t epr)     { mEventPlaneRot = epr; }
-  void SetTracks(TClonesArray *tracks)   { mTrack = tracks; }
-
-  ClassDef(Oscar97Event, 1)
-};
-
-#endif 

+ 0 - 55
StRoot/StFemtoDstMaker/Oscar97Track.cxx

@@ -1,55 +0,0 @@
-#include "Oscar97Track.h"
-
-
-
-ClassImp(Oscar97Track)
-
-
-//________________
-Oscar97Track::Oscar97Track() : 
-mId(0), mPdgId(0), mPx(0.), mPy(0.), mPz(0.), mE(0.),
-  mMass(0.), mXfr(0.), mYfr(0.), mZfr(0.), mTfr(0.),
-  mIsSpec(0.)
-{ }
-
-
-//________________
-Oscar97Track &Oscar97Track::operator=(const Oscar97Track &orig) {
-  if (this != &orig) {
-    mId = orig.mId;
-    mPdgId = orig.mPdgId;
-    mPx = orig.mPx;
-    mPy = orig.mPy;
-    mPz = orig.mPz;
-    mE = orig.mE;
-    mMass = orig.mMass;
-    mXfr = orig.mXfr;
-    mYfr = orig.mYfr;
-    mZfr = orig.mZfr;
-    mTfr = orig.mTfr;
-    mIsSpec = orig.mIsSpec;
-  }
-  return *this;
-}
-
-
-
-//________________
-void Oscar97Track::SetTrack(Int_t id, Int_t pdgId, 
-			  Float_t px, Float_t py, Float_t pz, 
-			  Float_t energy, Float_t mass,
-			  Float_t xFr, Float_t yFr, Float_t zFr,
-			  Float_t tFr, Bool_t isSpec) {
-  mId = id;
-  mPdgId = pdgId;
-  mPx = px;
-  mPy = py;
-  mPz = pz;
-  mE = energy;
-  mMass = mass;
-  mXfr = xFr;
-  mYfr = yFr;
-  mZfr = zFr;
-  mTfr = tFr;
-  mIsSpec = isSpec;
-}

+ 0 - 71
StRoot/StFemtoDstMaker/Oscar97Track.h

@@ -1,71 +0,0 @@
-#ifndef Oscar97Track_h
-#define Oscar97Track_h
-
-#include <TObject.h>
-#include <TClonesArray.h>
-#include <TRef.h>
-#include <TH1.h>
-#include <TBits.h>
-
-
-//_________________
-class Oscar97Track : public TObject {
-
- private:
-
-  Int_t   mId;     // Number of the particle
-  Int_t   mPdgId;  // PDG code
-  Float_t mPx;     // Px (GeV/c)
-  Float_t mPy;     // Py (GeV/c)
-  Float_t mPz;     // Pz (GeV/c)
-  Float_t mE;      // Energy (GeV/c)
-  Float_t mMass;   // Particle mass (GeV/c)
-  Float_t mXfr;    // x at freeze-out (fm)
-  Float_t mYfr;    // y at freeze-out (fm)
-  Float_t mZfr;    // z at freeze-out (fm)
-  Float_t mTfr;    // Freeze-out time (fm/c)
-  Bool_t  mIsSpec; // Is spectator if x,y,z and t < 0.0001
-
- public:
-
-  Oscar97Track();
-  Oscar97Track &operator=(const Oscar97Track &orig);
-  ~Oscar97Track() { /* nothing */ }
-  
-  void    SetTrack(Int_t id, Int_t pdgId, 
-		   Float_t px, Float_t py, Float_t pz, 
-		   Float_t energy, Float_t mass,
-		   Float_t xFr, Float_t yFr, Float_t zFr, 
-		   Float_t tFr, Bool_t isSpec);
-  Int_t   GetId() const { return mId; }
-  Int_t   GetPdgId() const { return mPdgId; }
-  Float_t GetPx() const { return mPx; }
-  Float_t GetPy() const { return mPy; }
-  Float_t GetPz() const { return mPz; }
-  Float_t GetE() const { return mE; }
-  Float_t GetEnergy() const { return mE; }
-  Float_t GetMass() const { return mMass; }
-  Float_t GetXfr() const { return mXfr; }
-  Float_t GetYfr() const { return mYfr; }
-  Float_t GetZfr() const { return mZfr; }
-  Float_t GetTfr() const { return mTfr; }
-  Bool_t  GetIsSpec() const { return mIsSpec; }
-
-  void    SetId(Int_t id) { mId = id; }
-  void    SetPdgId(Int_t pdgId) { mPdgId = pdgId; }
-  void    SetPx(Float_t px) { mPx = px; }
-  void    SetPy(Float_t py) { mPy = py; }
-  void    SetPz(Float_t pz) { mPz = pz;}
-  void    SetE(Float_t energy) { mE = energy; }
-  void    SetMass(Float_t mass) { mMass = mass; }
-  void    SetXfr(Float_t xFr) { mXfr = xFr; }
-  void    SetYfr(Float_t yFr) { mYfr = yFr; }
-  void    SetZfr(Float_t zFr) { mZfr = zFr; }
-  void    SetTfr(Float_t tFr) { mTfr = tFr; }
-  void    SetIsSpec(Bool_t isSpec) { mIsSpec = isSpec; }
-
-  ClassDef(Oscar97Track, 1)
-};
-
-
-#endif

+ 1 - 4
StRoot/StFemtoDstMaker/StFemtoDstInclusiveSelector.cxx

@@ -50,8 +50,6 @@ StFemtoDstInclusiveSelector::StFemtoDstInclusiveSelector(StMuDstMaker *muMaker,
   mTrackDcaGlobal[1] = 5.;
   mTrackNHits[0] = 14;
   mTrackNHits[1] = 50;
-  mTrackNHitsFit[0] = 14;
-  mTrackNHitsFit[1] = 50;
 
   mTrackEta[0] = -1.;
   mTrackEta[1] = 1.;
@@ -214,7 +212,7 @@ Int_t StFemtoDstInclusiveSelector::Make() {
     mEventIsGood = false;
     mPrimVertex = mMuDst->primaryVertex(iVert);
     if (!mPrimVertex) {
-      std::cout << "No primary vertices in the event. Skip..." << std::endl;
+      //std::cout << "No primary vertices in the event. Skip..." << std::endl;
       continue;
     }
 
@@ -469,7 +467,6 @@ Bool_t StFemtoDstInclusiveSelector::AcceptTrack(StMuTrack *trk, UShort_t vtxInd)
      trk->type() == 1 &&
      trk->eta() >= mTrackEta[0] && trk->eta() <= mTrackEta[1] &&
      trk->nHits() >= mTrackNHits[0] && trk->nHits() <= mTrackNHits[1] &&
-     trk->nHitsFit() >= mTrackNHitsFit[0] && trk->nHitsFit() <= mTrackNHitsFit[1] &&
      trk->flag() >= mTrackFlag[0] && trk->flag() <= mTrackFlag[1] &&
      trk->dca(vtxInd).perp() >= mTrackDca[0] && trk->dca(vtxInd).perp() <= mTrackDca[1] &&
      trk->dcaGlobal(vtxInd).perp() >= mTrackDcaGlobal[0] &&

+ 0 - 2
StRoot/StFemtoDstMaker/StFemtoDstInclusiveSelector.h

@@ -81,7 +81,6 @@ class StFemtoDstInclusiveSelector : public StMaker {
   void SetTrackDca(const Float_t& lo, const Float_t& hi)  { mTrackDca[0]=lo; mTrackDca[1]=hi; }
   void SetTrackDcaGlobal(const Float_t& lo, const Float_t& hi) { mTrackDcaGlobal[0]=lo; mTrackDcaGlobal[1]=hi; }
   void SetTrackNHits(const Int_t& lo, const Int_t& hi)    { mTrackNHits[0]=lo; mTrackNHits[1]=hi; }
-  void SetTrackNHitsFit(const Int_t& lo, const Int_t& hi) { mTrackNHitsFit[0]=lo; mTrackNHitsFit[1]=hi; }
   void SetTrackEta(const Float_t& lo, const Float_t& hi)  { mTrackEta[0]=lo; mTrackEta[1]=hi; }
   void SetTrackFlag(const Short_t& lo, const Short_t& hi) { mTrackFlag[0]=lo; mTrackFlag[1]=hi;}
 
@@ -157,7 +156,6 @@ class StFemtoDstInclusiveSelector : public StMaker {
   Float_t  mTrackDca[2];
   Float_t  mTrackDcaGlobal[2];
   UShort_t mTrackNHits[2];
-  UShort_t mTrackNHitsFit[2];
   Float_t  mTrackEta[2];
   Short_t  mTrackFlag[2];
 

+ 23 - 10
StRoot/StFemtoDstMaker/StFemtoDstPythia6Maker.cxx

@@ -95,8 +95,10 @@ Int_t StFemtoDstPythia6Maker::Make() {
 
   Int_t mNumParticles = 0;
   Int_t pyPosTrkNum = 0;
-  Int_t pyNegTrkNum = 0;
+  Int_t pyPosTrk2Num = 0;
+  //Int_t pyNegTrkNum = 0;
   Int_t pyRefMult = 0;
+  Int_t pyRefMult2 = 0;
   Int_t pyPrimTracksNum = 0;
   Int_t pyGlobTracksNum = 0;
   
@@ -165,9 +167,20 @@ Int_t StFemtoDstPythia6Maker::Make() {
 	pyPosTrkNum++;
       }
 
+      /*
       if(pyCharge<0) {
 	pyNegTrkNum++;
       }
+      */
+    }
+
+    //Calculate refMult2
+    if(TMath::Abs(pyEta)<=1. && pyP>=0.075 && pyCharge!=0) {
+      pyRefMult2++;
+
+      if(pyCharge>0) {
+	pyPosTrk2Num++;
+      }
     }
 
     //Calculate number of primary and global tracks
@@ -239,14 +252,13 @@ Int_t StFemtoDstPythia6Maker::Make() {
     mFTrack->SetId( iTrk );
     mFTrack->SetNHits( (Char_t) (pyCharge * mNHits) );
     mFTrack->SetNHitsPoss( mNHits );
-    mFTrack->SetNHitsFit( mNHits );
-    mFTrack->SetNHitsDedx( mNHits );
+    //mFTrack->SetNHitsDedx( mNHits );
     mFTrack->SetNSigmaElectron( pyTrkNSigmaElectron );
     mFTrack->SetNSigmaPion( pyTrkNSigmaPion );
     mFTrack->SetNSigmaKaon( pyTrkNSigmaKaon );
     mFTrack->SetNSigmaProton( pyTrkNSigmaProton );
     mFTrack->SetDedx( dedxMean(pyTrkMass, pyP) );
-    mFTrack->SetChi2( 1. );
+    //mFTrack->SetChi2( 1. );
 
     if(ptot < 0.15) { //Tracks only in the inner sector. R=1m
       tmap1 = 0;
@@ -326,15 +338,16 @@ Int_t StFemtoDstPythia6Maker::Make() {
   mFemtoEvent->SetRunId( randy->Uniform(1, 10000000) );
   mFemtoEvent->SetCollisionType( false );
   mFemtoEvent->SetRefMult( pyRefMult );
+  mFemtoEvent->SetRefMult2( pyRefMult2 );
   mFemtoEvent->SetRefMultCorr( pyRefMult );
   mFemtoEvent->SetRefMultCorrWeight( 1. );
-  mFemtoEvent->SetCent9( 0 );
   mFemtoEvent->SetCent16( 0 );
   mFemtoEvent->SetRefMultPos( pyPosTrkNum );
-  mFemtoEvent->SetRefMultNeg( pyNegTrkNum );
+  mFemtoEvent->SetRefMult2Pos( pyPosTrk2Num );
+  //mFemtoEvent->SetRefMultNeg( pyNegTrkNum );
   //mFemtoEvent->SetZDCe( 45000 );
   //mFemtoEvent->SetZDCw( 45000 );
-  mFemtoEvent->SetBTofTrayMultiplicity( pyRefMult );
+  mFemtoEvent->SetNumberOfBTofHit( pyRefMult );
   mFemtoEvent->SetNumberOfPrimaryTracks( pyPrimTracksNum );
   mFemtoEvent->SetNumberOfGlobalTracks( pyGlobTracksNum );
   mFemtoEvent->SetMagneticField( mMagneticField );
@@ -383,7 +396,8 @@ Bool_t StFemtoDstPythia6Maker::AcceptTrack(TMCParticle *trk, Int_t charge) {
   Float_t vx = trk->GetVx() / 10.;
   Float_t vy = trk->GetVy() / 10.;
   Float_t vz = trk->GetVz() / 10.;
-  Float_t dcaXY = TMath::Sqrt(vx*vx + vy*vy);
+  //dcaXY is dcaXYZ now
+  Float_t dcaXY = TMath::Sqrt(vx*vx + vy*vy + vz*vz);
   
   Bool_t mIsGoodKinematics = false;
   Bool_t mIsGoodCharge = false;
@@ -400,8 +414,7 @@ Bool_t StFemtoDstPythia6Maker::AcceptTrack(TMCParticle *trk, Int_t charge) {
       dcaXY >= mTrackDca[0] &&
       dcaXY <= mTrackDca[1] &&
       dcaXY >= mTrackDcaGlobal[0] &&
-      dcaXY <= mTrackDcaGlobal[1] &&
-      TMath::Abs(vz) <= 2.) {
+      dcaXY <= mTrackDcaGlobal[1]) {
 
     mIsGoodKinematics = true;
   }

+ 30 - 22
StRoot/StFemtoDstMaker/StFemtoEvent.cxx

@@ -136,28 +136,36 @@ void StFemtoEvent::SetMagneticField(Float_t f) {
 //_________________
 UShort_t StFemtoEvent::GetCent9() const {
 
-  UShort_t mCent9 = 0;
-  switch(mCent16) {
-  case 15: mCent9 = 8; break; //0-5%
-  case 14: mCent9 = 7; break; //5-10%
-  case 13: mCent9 = 6; break; //10-15%
-  case 12: mCent9 = 6; break; //15-20%
-  case 11: mCent9 = 5; break; //20-25%
-  case 10: mCent9 = 5; break; //25-30%
-  case 9:  mCent9 = 4; break; //30-35%
-  case 8:  mCent9 = 4; break; //35-40%
-  case 7:  mCent9 = 3; break; //40-45%
-  case 6:  mCent9 = 3; break; //45-50%
-  case 5:  mCent9 = 2; break; //50-55%
-  case 4:  mCent9 = 2; break; //55-60%
-  case 3:  mCent9 = 1; break; //60-65%
-  case 2:  mCent9 = 1; break; //65-70%
-  case 1:  mCent9 = 0; break; //70-75%
-  case 0:  mCent9 = 0; break; //75-80%
-  default: mCent9 = 0; break;
-  };
-  
-  return mcent9;
+  if(mCent16 == 15) {  
+    return 8;  //0-5%      
+  }
+  else if(mCent16 == 14) {
+    return 7;  //5-10%
+  }
+  else if( (mCent16 == 13) || (mCent16 == 12) ) {
+    return 6;  //10-20%
+  }
+  else if( (mCent16 == 11) || (mCent16 == 10) ) {
+    return 5;  //20-30%
+  }
+  else if( (mCent16 == 9) || (mCent16 == 8) ) {
+    return 4;  //30-40%
+  }
+  else if( (mCent16 == 7) || (mCent16 == 6) ) {
+    return 3;  //40-50%
+  }
+  else if( (mCent16 == 5) || (mCent16 == 4) ) {
+    return 2;  //50-60%
+  }
+  else if( (mCent16 == 3) || (mCent16 == 2) ) {
+    return 1;  //60-70%
+  }
+  else if( (mCent16 == 1) || (mCent16 == 0) ) {
+    return 0;  //70-80%
+  }
+  else {
+    return 9999;
+  }
 }
 
 /*

+ 1 - 1
StRoot/StFemtoDstMaker/StFemtoEvent.h

@@ -81,7 +81,7 @@ class StFemtoEvent : public TObject {
   
   Int_t    mEventId;
   Int_t    mRunId;
-  Bool_t   mCollisionType;       //0-pp, 1-AA
+  Bool_t   mCollisionType;       //0-pp, 1-AA(from those where RefMultCorr is defined)
   UShort_t mRefMult;             //mRefMult
   UShort_t mRefMultCorr;         //mRefMultCorr * 10
   UShort_t mRefMultCorrWeight;   //mRefMultCorrWight * 10000

+ 2 - 2
StRoot/StFemtoDstMaker/StHbtFemtoDstReader.cxx

@@ -243,9 +243,9 @@ StHbtEvent *StHbtFemtoDstReader::Read() {
 
 	mHbtTrack->SetTrackId( mFemtoTrack->GetId() );
 	mHbtTrack->SetTrackType(mFemtoTrack->GetType());
-	mHbtTrack->SetCharge( charge );
 	mHbtTrack->SetFlag( mFemtoTrack->GetFlag() );
-	
+
+  mHbtTrack->SetCharge( charge );
 	mHbtTrack->SetNHits( mFemtoTrack->GetNHits() );
 	mHbtTrack->SetNHitsFit( mFemtoTrack->GetNHitsFit() );
 	mHbtTrack->SetNHitsPossible( mFemtoTrack->GetNHitsPoss() );

+ 4 - 4
StRoot/StFemtoDstMaker/StHbtO97DstReader.cxx

@@ -267,11 +267,10 @@ StHbtEvent *StHbtO97DstReader::Read() {
 	// Set mO97Track info
 	mHbtTrack->SetTrackId( mO97Track->GetId() );
 	mHbtTrack->SetTrackType( 1 ); // 0 - global, 1 - primary
-	mHbtTrack->SetCharge( charge );
 	mHbtTrack->SetFlag( 400 );
 	
-	mHbtTrack->SetNHits( 45 );
-	mHbtTrack->SetNHitsFit( 45 );
+	mHbtTrack->SetNHits( 45*charge );
+	//mHbtTrack->SetNHitsFit( 45 );
 	mHbtTrack->SetNHitsPossible( 45 );
 	mHbtTrack->SetNHitsDedx( 45 );
 	
@@ -314,11 +313,12 @@ StHbtEvent *StHbtO97DstReader::Read() {
 	
 	mHbtTrack->SetTofBeta( trkMom.mag()/mO97Track->GetEnergy() );
 	mHbtTrack->SetHiddenInfo(0);
+  /*
 	mHbtTrack->SetFreezeOutX( mO97Track->GetXfr() );
 	mHbtTrack->SetFreezeOutY( mO97Track->GetYfr() );
 	mHbtTrack->SetFreezeOutZ( mO97Track->GetZfr() );
 	mHbtTrack->SetFreezeOutT( mO97Track->GetTfr() );
-	
+	*/
 	mHbtEvent->TrackCollection()->push_back( mHbtTrack );
       } // for (int i = 0; i < nTracks; i++)
     } // if (mO97TrackArr)

BIN
StRoot/StFlow/.StFlow.cxx.un~


BIN
StRoot/StFlow/.StFlow.h.un~


+ 3 - 3
StRoot/StHbtMaker/.consign

@@ -1,3 +1,3 @@
-StRandyTopMapMaker.h:1453275723 - ddcf90ddf2644fa118a0e3aed113c20a
-StHbtTagMaker.h:1432557452 - f3a0c4e407a231804e28ea5a3a0f7eb2
-StHbtMaker.h:1453275672 - c2dfc18bac48fa4cb544bd90ea1bb506
+StRandyTopMapMaker.h:1499277872 - ddcf90ddf2644fa118a0e3aed113c20a
+StHbtTagMaker.h:1499277872 - f3a0c4e407a231804e28ea5a3a0f7eb2
+StHbtMaker.h:1499277863 - c2dfc18bac48fa4cb544bd90ea1bb506

+ 21 - 21
StRoot/StHbtMaker/Base/.consign

@@ -1,21 +1,21 @@
-StHbtXiCut.h:1432557432 - 84c321d865b0b92838de17cce73c8ede
-StHbtLikeSignCorrFctn.hh:1432557432 - 7020177bb74736ce989b2079448f1959
-StHbtBaseAnalysis.h:1432557437 - 971a7fe1db40d727c0b2d92baa3e1b8a
-StHbtEventCut.h:1432557430 - 5c449391085133c3b52b793a173fe065
-StHbtThCorrFctn.hh:1432557431 - 3dcc81078769c5f14e55808099ad4aa3
-StHbtPairCut.h:1432557433 - 05c875e9c050a86cc43ec222be060c1b
-StHbtEventReader.hh:1432557438 - d3b28bedfcf77b7eb4632585ba505188
-StHbtRoot1DCF.hh:1432557430 - 7f360f3c3ed4e6d4d85cc8ce5ae1dd1b
-StHbtRoot2DCF.hh:1432557431 - 5b35bd5ea893e9e5b2c2d57d90814c62
-StHbtFsiWeight.hh:1432557438 - 390d678b84bd480cdbf896b6a31129c1
-StHbtV0Cut.h:1432557435 - 2fae89bd3d48afdcc1b7bbbb0710453d
-StHbtHiddenInfo.hh:1432557430 - efccf3bb267bf430a768ca2d3f98a6a2
-StHbtParticleCut.h:1432557436 - 55fe540881d1cb53f08f83258235cfc2
-StHbtTripletCut.h:1432557435 - ad599e52265c79233ef4371ae4e18ab1
-StHbtThPair.hh:1432557434 - 3d0102c2fb19d55f100a0f9c75b242ef
-StHbtCorrFctn.hh:1432557437 - 1c041139bb22d949bf2f7b11e4ff86a1
-StHbtRoot3DCF.hh:1432557436 - 6971a5d8139fae54db30bfa02017dd41
-StHbtCutMonitor.hh:1432557432 - f01ee69b90d2edaa4b7fc7566be4e7e5
-StHbtEventWriter.hh:1432557431 - 0ddc601c196b4929021b07bb15d4743d
-StHbtTrackCut.h:1432557435 - caea760e22e033389628a40ec01d7feb
-StHbtKinkCut.h:1432557433 - 9a0a7c862cb6155a0366b8d63bfbf0b6
+StHbtXiCut.h:1499277863 - 84c321d865b0b92838de17cce73c8ede
+StHbtLikeSignCorrFctn.hh:1499277864 - 7020177bb74736ce989b2079448f1959
+StHbtBaseAnalysis.h:1499277864 - 971a7fe1db40d727c0b2d92baa3e1b8a
+StHbtEventCut.h:1499277864 - 5c449391085133c3b52b793a173fe065
+StHbtThCorrFctn.hh:1499277864 - 3dcc81078769c5f14e55808099ad4aa3
+StHbtPairCut.h:1499277864 - 05c875e9c050a86cc43ec222be060c1b
+StHbtEventReader.hh:1499277864 - d3b28bedfcf77b7eb4632585ba505188
+StHbtRoot1DCF.hh:1499277864 - ac87ef50eb4d87e8e7055fb3978c9021
+StHbtRoot2DCF.hh:1499277864 - 5b35bd5ea893e9e5b2c2d57d90814c62
+StHbtFsiWeight.hh:1499277864 - 390d678b84bd480cdbf896b6a31129c1
+StHbtV0Cut.h:1499277864 - 2fae89bd3d48afdcc1b7bbbb0710453d
+StHbtHiddenInfo.hh:1499277864 - efccf3bb267bf430a768ca2d3f98a6a2
+StHbtParticleCut.h:1499277864 - 55fe540881d1cb53f08f83258235cfc2
+StHbtTripletCut.h:1499277864 - ad599e52265c79233ef4371ae4e18ab1
+StHbtThPair.hh:1499277864 - 3d0102c2fb19d55f100a0f9c75b242ef
+StHbtCorrFctn.hh:1499277863 - 1c041139bb22d949bf2f7b11e4ff86a1
+StHbtRoot3DCF.hh:1499277864 - 6971a5d8139fae54db30bfa02017dd41
+StHbtCutMonitor.hh:1499277864 - f01ee69b90d2edaa4b7fc7566be4e7e5
+StHbtEventWriter.hh:1499277864 - 0ddc601c196b4929021b07bb15d4743d
+StHbtTrackCut.h:1499277864 - caea760e22e033389628a40ec01d7feb
+StHbtKinkCut.h:1499277864 - 9a0a7c862cb6155a0366b8d63bfbf0b6

+ 52 - 45
StRoot/StHbtMaker/CorrFctn/.consign

@@ -1,45 +1,52 @@
-MinvCorrFctnM_vs_Phi.h:1432557335 - 09f82aa5910986b8509e6806a13a0283
-MinvLikeSignCorrFctn_Minv_vs_Pt.h:1432557328 - 4917173d41ee2a45d0492006afa956c0
-MinvLikeSignCorrFctn.h:1432557339 - 9a0ac24e64b658fe580c3bda47afcb8f
-YKPLongitudinal.h:1432557342 - 65f4975f3f22829497e579cc84f069c1
-MinvCorrFctnY_vs_Pt.h:1432557325 - 4a9d08934e52d92dcbb4282b48984dbf
-NonId3DCorrFctn.h:1432557340 - f8d7bf3bb7c65e23b7ba6caf12e5e408
-BPLCMSFrame3DCorrFctn.h:1432557328 - 51cff112fe36a8abc2da16b09748558f
-QoslCMSCorrFctnRPkT.h:1432557344 - 859f7294a96f22defeb0b1f747ea4d2d
-EntSep_pTCorrFctn.h:1432557341 - 50521223da7589a6da4b77c9d031af82
-QinvQualAvSepCorrFctn.h:1432557322 - a475ec138bd2e5bcef40fbb97c2bce4b
-ntuplePair.h:1432557332 - 26efc084a5de4f256107a1119bf95f37
-QinvCorrFctnKt.h:1432557345 - fb4c698dc223d534e019b1757e32184b
-EntranceSepCorrFctn.h:1432557337 - 5cfcfcc1a4e97e1d876417b0fa404627
-QinvCorrFctnOpposHemisphereKt.h:1432557337 - ebbc63b5c98465efe073500cf26fb1c2
-NonIdPurityCorrFctn.h:1432557347 - 38074efbe17b8edc74620044907ba1a4
-MinvCorrFctn.h:1432557338 - 53250bc1abb04b2226bab9b2dfec99b0
-OpeningAngleCorrFctn.h:1432557326 - 90f7e65fe72df0ee0e42da00fba7c834
-QvecQualCorrFctn.h:1432557338 - 9c3eb791ece0b1e08761fb7618257db5
-ParityCorrFctn.h:1432557343 - 44cdf7215fee0a982ae26b545cab0339
-QinvCorrFctnRotation.h:1432557345 - eade5e3958d329a3cead12ede8aad3e2
-QinvCorrFctnRotationKt.h:1432557326 - f1abe189b0b804d83dc3a8eed2a1e0af
-BPLabFrame3DCorrFctn.h:1432557324 - 979b4aa6ce48c825da8eea440ed9cb51
-StHbtCorrFctnDirectYlm.h:1432557341 - 31c4371509bf0f0766acc1a16dc41d45
-FracMergRowvsQinv.h:1432557336 - 1c39bfba19bb99d3c51b5a17db43501e
-MinvLikeSignCorrFctn_Minv_vs_Phi.h:1432557323 - c349f37a654eb869575ed83720c986ca
-BPLCMSFrame3DCorrFctnKt.h:1432557345 - b79d00d9c9942f7335ac9a9c7329dbf3
-QinvCorrFctnPidProbWeight.h:1432557335 - f2f091d8904a421587aed6b6b5179eaa
-QvecCorrFctn.h:1432557346 - 9b0694e953eee86994fe0857048765c1
-QinvEbyECorrFctn.h:1432557320 - 3079786e2eba425e842f4f1d22958ba5
-ExitSepCorrFctn.h:1432557337 - ff758dd8fb05d7fe08820ea82a9ec86c
-MinvCorrFctnArmenteros.h:1432557327 - 1759c8e2ef0c684285e4d4cf7a943184
-MinvLikeSignCorrFctn_MinvYPt.h:1432557327 - 6d1988db5e133e41a49799da3af8d8d5
-AverageSepCorrFctn.h:1432557344 - 1dab3a13c01a0b83a569fc772abe9d72
-NonIdReal3DCorrFctn.h:1432557334 - d6d55b2763ab69ce92bc1913350df8ec
-Trk2CorrFctn.h:1432557344 - 9be6ebadd3342420ac413e4b22814ae9
-Q3invCorrFctn.h:1432557328 - 79f1b802afc4a16617dbc3731be18b5e
-ParityTwistCorrFctn.h:1432557328 - aa8fcc07464d691b84dd7fe12acd5c62
-QinvCorrFctnOpposHemisphere.h:1432557341 - 70e3bb82699c21a20a8dbaca695864f2
-QinvCorrFctnC.h:1432557338 - 0743c552eb0a77d564b232fa4995179a
-BPLCMSFrame3DCorrFctn_SIM.h:1432557340 - 3101ca9786f3405a00e06d16226f7eb0
-MinvCorrFctnM_vs_Pt.h:1432557329 - 3e82b22708d922ed3c37d1dc713f18d7
-ParityDevCorrFctn.h:1432557346 - b3757823d6d5b6b24a2c7d80c4bb17f9
-StHbtYlm.h:1432557339 - cb08225bf0032ef12dcef96f4c4da979
-mTmTCorrFctn.h:1432557331 - 37be12fcc7d8bb39256339539d459634
-QinvCorrFctn.h:1432557329 - 169a7399dd43385eaa614f03c8c8c064
+QinvCorrFctnKt_MomCons.h:1500066292 - fef62ee3bfbd686e4c120558d3092ce5
+MinvCorrFctnM_vs_Phi.h:1499277865 - 09f82aa5910986b8509e6806a13a0283
+QinvCorrFctn_MomAndEnCons.h:1499277867 - 78044a63e8d54f886fbc9d80e970bc47
+MinvLikeSignCorrFctn_Minv_vs_Pt.h:1499277867 - 4917173d41ee2a45d0492006afa956c0
+MinvLikeSignCorrFctn.h:1499277865 - 9a0ac24e64b658fe580c3bda47afcb8f
+YKPLongitudinal.h:1499277865 - 65f4975f3f22829497e579cc84f069c1
+MinvCorrFctnY_vs_Pt.h:1499277866 - 4a9d08934e52d92dcbb4282b48984dbf
+BPLCMSFrame3DCorrFctn.h:1499277867 - f617f7420007fc0a8418ea54067cf36b
+NonId3DCorrFctn.h:1499277866 - f8d7bf3bb7c65e23b7ba6caf12e5e408
+gregsBPLCMSFrame3DCorrFctnKt.h:1499277866 - 4c8d627d02cc633b669162aa5491a2a3
+QoslCMSCorrFctnRPkT.h:1499277867 - 859f7294a96f22defeb0b1f747ea4d2d
+QinvCorrFctn_MomCons.h:1499277864 - 52b81abed5b07ea0dd9dca0d4cce30c5
+EntSep_pTCorrFctn.h:1499277865 - 50521223da7589a6da4b77c9d031af82
+QinvQualAvSepCorrFctn.h:1499277865 - a475ec138bd2e5bcef40fbb97c2bce4b
+ntuplePair.h:1499277865 - 26efc084a5de4f256107a1119bf95f37
+QinvCorrFctnKt.h:1499277866 - 4ec83643b9f850713067191ff3888058
+EntranceSepCorrFctn.h:1499277866 - 5cfcfcc1a4e97e1d876417b0fa404627
+NonIdPurityCorrFctn.h:1499277865 - 38074efbe17b8edc74620044907ba1a4
+QinvCorrFctnOpposHemisphereKt.h:1499277867 - 62a588da2200cf3bafe4ec2181e5fc0a
+MinvCorrFctn.h:1499277867 - 53250bc1abb04b2226bab9b2dfec99b0
+OpeningAngleCorrFctn.h:1499277866 - 90f7e65fe72df0ee0e42da00fba7c834
+QvecQualCorrFctn.h:1499277866 - 9c3eb791ece0b1e08761fb7618257db5
+ParityCorrFctn.h:1499277866 - 44cdf7215fee0a982ae26b545cab0339
+QinvCorrFctnRotation.h:1499277866 - eade5e3958d329a3cead12ede8aad3e2
+QinvCorrFctnRotationKt.h:1499277865 - ac9f685e85cca44204020209103d1590
+BPLabFrame3DCorrFctn.h:1499277866 - 979b4aa6ce48c825da8eea440ed9cb51
+StHbtCorrFctnDirectYlm.h:1499277866 - 31c4371509bf0f0766acc1a16dc41d45
+FracMergRowvsQinv.h:1499277867 - 1c39bfba19bb99d3c51b5a17db43501e
+MinvLikeSignCorrFctn_Minv_vs_Phi.h:1499277866 - c349f37a654eb869575ed83720c986ca
+QinvCorrFctnSmeared.h:1499277867 - 7cbaada61c82315bb78e89c7919323d0
+BPLCMSFrame3DCorrFctnKt.h:1499277865 - b79d00d9c9942f7335ac9a9c7329dbf3
+QinvCorrFctnPidProbWeight.h:1499277865 - f2f091d8904a421587aed6b6b5179eaa
+ExitSepCorrFctn.h:1499277866 - ff758dd8fb05d7fe08820ea82a9ec86c
+QinvEbyECorrFctn.h:1499277866 - 3079786e2eba425e842f4f1d22958ba5
+QvecCorrFctn.h:1499277865 - 9b0694e953eee86994fe0857048765c1
+MinvCorrFctnArmenteros.h:1499277866 - 1759c8e2ef0c684285e4d4cf7a943184
+AverageSepCorrFctn.h:1499277865 - 1dab3a13c01a0b83a569fc772abe9d72
+MinvLikeSignCorrFctn_MinvYPt.h:1499277866 - 6d1988db5e133e41a49799da3af8d8d5
+NonIdReal3DCorrFctn.h:1499277866 - d6d55b2763ab69ce92bc1913350df8ec
+Trk2CorrFctn.h:1499277865 - 9be6ebadd3342420ac413e4b22814ae9
+Q3invCorrFctn.h:1499277866 - 79f1b802afc4a16617dbc3731be18b5e
+ParityTwistCorrFctn.h:1499277865 - aa8fcc07464d691b84dd7fe12acd5c62
+QinvCorrFctnKt_MomAndEnCons.h:1499277866 - 2267b41ac8e7cb078dc42d7f41680de2
+gregsBPLCMSFrame3DCorrFctn.h:1499277864 - 499443b022b719d74a2d9a3905f08cd8
+QinvCorrFctnOpposHemisphere.h:1499277867 - 70e3bb82699c21a20a8dbaca695864f2
+QinvCorrFctnC.h:1499277865 - 0743c552eb0a77d564b232fa4995179a
+BPLCMSFrame3DCorrFctn_SIM.h:1499277865 - 3101ca9786f3405a00e06d16226f7eb0
+MinvCorrFctnM_vs_Pt.h:1499277865 - 3e82b22708d922ed3c37d1dc713f18d7
+ParityDevCorrFctn.h:1499277864 - b3757823d6d5b6b24a2c7d80c4bb17f9
+StHbtYlm.h:1499277865 - cb08225bf0032ef12dcef96f4c4da979
+mTmTCorrFctn.h:1499277866 - 37be12fcc7d8bb39256339539d459634
+QinvCorrFctn.h:1499277867 - 879cf538c4c2ac2ce0edc0bbeba5c7fd

+ 1 - 1
StRoot/StHbtMaker/CorrFctn/QinvCorrFctnKt_MomCons.h

@@ -6,7 +6,7 @@
 
 //_________________
 class QinvCorrFctnKt_MomCons : public StHbtCorrFctn {
-
+ public:
   QinvCorrFctnKt_MomCons(char *title,
 			 const int& nbins, const float& QinvLo, const float& QinvHi,
 			 const int& nCFs=20, const float& KtLo=0., const float& KtHi=1.);

+ 65 - 55
StRoot/StHbtMaker/Cut/.consign

@@ -1,55 +1,65 @@
-anglePairCut.h:1432557400 - d71fe44e83efc71f0b267b7978aba511
-kTPairCut.h:1432557410 - 891d047051ec16a80987d8564143d370
-OpenAngPairCut.h:1432557423 - 9a233713db31b36d48872ab7db1a3432
-QinvPairCut.h:1432557405 - d42713b96f61e3fb97f13386ec8f0439
-AverageSepPairCut.h:1432557397 - 0c6ba8831f273dc120dcf5062d9295c5
-dummyV0Cut.h:1432557401 - 945631a76f94049a8b100bbba50b9b5c
-mikesStarStandardEventCut.h:1432557405 - 4d929854dedf9a799e417b36f506d60a
-rotateToReactionPlaneEventCut.h:1432557402 - 394cf910e4dab3ed308eb06f75531afd
-eventCutMonitor_Mult.h:1432557405 - 51703241e53bb4c1ec98c402a60ae1c4
-gregsEventCut.h:1432557404 - ca0984623c245365c3a92634273a4e30
-franksV0Cut.h:1432557398 - 539962f0b3e86766d1d79d1f9b4187fe
-mikesKinkCut.h:1432557398 - dd0d7e4ab970b9b0ac585ef5cf86b0b9
-fabricesPairCut.h:1432557423 - 67259cdc299ea06f7ed8c5a2b83cec1a
-trackCutMonitor_P_vs_Msqr.h:1432557425 - d3c3e2c9ac0453c5fd68b46b4c0c6c98
-calculateEventPlaneEventCut.h:1432557409 - 6d08b9c3772dae2be0fa278f88829339
-ManyPairCuts.h:1432557427 - 802759b743b086ad5504d74f6692d4e9
-helensV0Cut.h:1432557416 - bd51043ab29527c84db14b0de5641090
-evansPairCut.h:1432557400 - 3c0ed658be360662fa774cff9d8a0280
-mercedesStarStandardEventCut.h:1432557410 - 8047907db24d41eb6503ea621ffd8374
-mikesTrackCut.h:1432557401 - a28d093e1ac25b66a2e04cd68a7ec420
-franksTrackCut.h:1432557427 - 291036cee020e80cde3396f34c171461
-EntranceSepPairCut.h:1432557405 - 10274d4fcf8573a58a0044cd819787cc
-trackCutMonitor_Pt.h:1432557413 - c64c0b75e0491b97a5f65a92930d5575
-HitMergingPairCut.h:1432557406 - f52981237b26478b5e53dea2f5c1c9c2
-helensLaPTrackCut.h:1432557421 - 1bb7ebeea64f04df5e401afc38a2a4d0
-helensLaPV0Cut.h:1432557403 - acee87bfe34b182140097e0fe070a9f4
-mikesPairCut.h:1432557413 - fc2b8af95279e6a92ab85fcfeed51d44
-pairCutMonitor_kT.h:1432557427 - acf04042eb40e4c0d1c37d52bf6644f8
-qualityPairCut.h:1432557414 - 19e3fab2507b48e94536ce1892c8c9f6
-eventCutMonitor_VpdVz.h:1432557402 - f0c50a7a9ae3a5b9ee08fb199e3f9d18
-franksPairCut.h:1432557425 - c726b15049f01702b676ad091fcaea12
-ntupleTrack.h:1432557411 - fbc50fec341d511082fbdd4858b71b01
-trackCutMonitor_DCA.h:1432557427 - dd20b291b09674b1d42ccd1abb509254
-franksXiCut.h:1432557422 - fa61f1289b97e8c564e04e705a7540e7
-trackCutMonitor_Nhits_vs_NhitsDedx.h:1432557413 - 81d0d698a69b91872bfbee98276709e6
-adamsPairCut.h:1432557422 - 98d140fe63e8b3f7b898a3e1843cf86f
-ExitSepPairCut.h:1432557419 - 7a42f0a0eed3ffb767efe170a28c92b1
-mercedesEventCutMonitor.h:1432557400 - f52365118f089722c29f88d035030069
-trackCutMonitor_Y_vs_Pt.h:1432557400 - 2d9a8d4f1e4efd3d8f2e0720d790c68b
-eventCutMonitor_ReactionPlane.h:1432557404 - 2eaa0880f1c33f8d8827dc6d7e716858
-mikesEventCut.h:1432557399 - 966113a143dc0750be72194cbdd171cf
-trackCutMonitor_P_vs_Dedx.h:1432557417 - 132926f14d350ef92da4e01967fb8c5f
-gregsTrackCut.h:1432557425 - bab5b3e0c8dc9ac4bd516f1f8914d5e1
-ntupleEvent.h:1432557414 - aa983524cc24c5f4f55779c8ee7cb0d8
-randomRotateEventCut.h:1432557416 - 65042cfa56b020c8fd6ddc30d6f28431
-v0CutMonitor_Minv.h:1432557410 - ffcd65d1cadf3c8042db3825a5667a36
-gregsTrackPairCut.h:1432557415 - 7da0a3f202003641a0f6460e2863a379
-ParityEventCut.h:1432557420 - 8ffbb6d15a9eca68edf13ee0c9301b69
-rotationEventCut.h:1432557424 - 82da3d1900d9791a7f3eb47923489410
-helensEventCut.h:1432557420 - 0078fbd5bc915020eb0b887f3021d408
-franksV0PairCut.h:1432557407 - 82b1b23718f08e9b615a46db0347420b
-franksTrackCutMonitor.h:1432557411 - f8f1fac225f1b8dcc163b5276ea39e51
-adamsTrackCut.h:1432557414 - e2352f4790413d21a8c5f74af21ff82e
-GenericTripletCut.h:1432557402 - e671a0dc7c7bffba45565ba7fc830be2
-trackCutMonitor_P.h:1432557426 - 41d18006d38e24e0f73d7b0f9eee96f1
+OpenAngPairCut.h:1499277860 - 9a233713db31b36d48872ab7db1a3432
+AverageSepPairCut.h:1499277861 - 0c6ba8831f273dc120dcf5062d9295c5
+dummyV0Cut.h:1499277861 - 945631a76f94049a8b100bbba50b9b5c
+eventCutMonitor_Mult.h:1499277859 - 51703241e53bb4c1ec98c402a60ae1c4
+gregsEventCut.h:1499277860 - 3576787579fd805ab55c766a59f00954
+mikesKinkCut.h:1499277861 - dd0d7e4ab970b9b0ac585ef5cf86b0b9
+calculateEventPlaneEventCut.h:1499277861 - 6d08b9c3772dae2be0fa278f88829339
+ManyPairCuts.h:1499277860 - 802759b743b086ad5504d74f6692d4e9
+mikesTrackCut.h:1499277860 - a28d093e1ac25b66a2e04cd68a7ec420
+franksTrackCut.h:1499277860 - 291036cee020e80cde3396f34c171461
+EntranceSepPairCut.h:1499277862 - 10274d4fcf8573a58a0044cd819787cc
+trackCutMonitor_Pt.h:1499277860 - c64c0b75e0491b97a5f65a92930d5575
+HitMergingPairCut.h:1499277860 - f52981237b26478b5e53dea2f5c1c9c2
+helensLaPTrackCut.h:1499277860 - 1bb7ebeea64f04df5e401afc38a2a4d0
+fxtEventCutMonitor.h:1499277860 - e84e1c9bb67ef1766db29aae39e786fe
+trackCutMonitor_DCA.h:1499277861 - dd20b291b09674b1d42ccd1abb509254
+franksXiCut.h:1499277862 - fa61f1289b97e8c564e04e705a7540e7
+adamsPairCut.h:1499277859 - 98d140fe63e8b3f7b898a3e1843cf86f
+eventCutMonitor_ReactionPlane.h:1499277860 - 2eaa0880f1c33f8d8827dc6d7e716858
+mikesEventCut.h:1499277860 - 966113a143dc0750be72194cbdd171cf
+trackCutMonitor_TpcNSigma.h:1499277861 - 6ec244de16914ea4d5d9ffdb8b3c0767
+gregsTrackCut.h:1499277861 - f5afb03cb3361f3d5754d92a86f913d0
+randomRotateEventCut.h:1499277861 - 65042cfa56b020c8fd6ddc30d6f28431
+v0CutMonitor_Minv.h:1499277862 - ffcd65d1cadf3c8042db3825a5667a36
+gregsPionTrackCut.h:1499277862 - c0d0d7c6ba14a232d91b4c2335a69299
+gregsTrackPairCut.h:1499277860 - a99b63a13207a8adb61efb8be96ec1e0
+rotationEventCut.h:1499277860 - 82da3d1900d9791a7f3eb47923489410
+helensEventCut.h:1499277860 - 0078fbd5bc915020eb0b887f3021d408
+franksV0PairCut.h:1499277861 - 82b1b23718f08e9b615a46db0347420b
+franksTrackCutMonitor.h:1499277861 - f8f1fac225f1b8dcc163b5276ea39e51
+adamsTrackCut.h:1499277861 - e2352f4790413d21a8c5f74af21ff82e
+trackCutMonitor_P.h:1499277861 - 41d18006d38e24e0f73d7b0f9eee96f1
+kTPairCut.h:1499277861 - 891d047051ec16a80987d8564143d370
+anglePairCut.h:1499277862 - d71fe44e83efc71f0b267b7978aba511
+QinvPairCut.h:1499277862 - d42713b96f61e3fb97f13386ec8f0439
+mikesStarStandardEventCut.h:1499277861 - 4d929854dedf9a799e417b36f506d60a
+fxtTrackCutMonitor.h:1499277860 - 7183e49d80719b877517caa23c1694b3
+rotateToReactionPlaneEventCut.h:1499277861 - 394cf910e4dab3ed308eb06f75531afd
+franksV0Cut.h:1499277860 - 539962f0b3e86766d1d79d1f9b4187fe
+fabricesPairCut.h:1499277861 - 67259cdc299ea06f7ed8c5a2b83cec1a
+trackCutMonitor_P_vs_Msqr.h:1499277861 - 6a334f04038d8792f3c51d27e8c7eca3
+helensV0Cut.h:1499277860 - bd51043ab29527c84db14b0de5641090
+mercedesStarStandardEventCut.h:1499277861 - 8047907db24d41eb6503ea621ffd8374
+evansPairCut.h:1499277862 - 3c0ed658be360662fa774cff9d8a0280
+fxtPairCutMonitor.h:1499277861 - c5823a4a8e8eff13038bb1dc66e3844f
+helensLaPV0Cut.h:1499277861 - acee87bfe34b182140097e0fe070a9f4
+pairCutMonitor_kT.h:1499277861 - acf04042eb40e4c0d1c37d52bf6644f8
+mikesPairCut.h:1499277861 - fc2b8af95279e6a92ab85fcfeed51d44
+nikEventCut.h:1499277860 - 33ee026602eb0020c88393c5554977e0
+qualityPairCut.h:1499277859 - 19e3fab2507b48e94536ce1892c8c9f6
+eventCutMonitor_VpdVz.h:1499277860 - f0c50a7a9ae3a5b9ee08fb199e3f9d18
+franksPairCut.h:1499277861 - c726b15049f01702b676ad091fcaea12
+ntupleTrack.h:1499277861 - fbc50fec341d511082fbdd4858b71b01
+trackCutMonitor_Nhits_vs_NhitsDedx.h:1499277862 - 81d0d698a69b91872bfbee98276709e6
+trackCutMonitor_Y_vs_Pt.h:1499277860 - 2d9a8d4f1e4efd3d8f2e0720d790c68b
+mercedesEventCutMonitor.h:1499277860 - f52365118f089722c29f88d035030069
+ExitSepPairCut.h:1499277860 - 7a42f0a0eed3ffb767efe170a28c92b1
+gregsKaonTrackCut.h:1499277862 - fb7b156d64a26578dd297dccc96f58a7
+gregsFemtoDstEventCut.h:1499277861 - 2f39ca291bc3491eb42d2b8fa5b60ef4
+trackCutMonitor_P_vs_Dedx.h:1499277861 - 132926f14d350ef92da4e01967fb8c5f
+ntupleEvent.h:1499277859 - aa983524cc24c5f4f55779c8ee7cb0d8
+gregsSimpleTrackCut.h:1499277860 - abf451c6287c6c598f655d48a36d8c3a
+nikTrackCut.h:1499277861 - 5f3d0188b2f92fcc32ab062b9a2bec9e
+ParityEventCut.h:1499277861 - 8ffbb6d15a9eca68edf13ee0c9301b69
+GenericTripletCut.h:1499277860 - e671a0dc7c7bffba45565ba7fc830be2

+ 9 - 17
StRoot/StHbtMaker/Cut/fxtEventCutMonitor.cxx

@@ -10,15 +10,11 @@ ClassImp(fxtEventCutMonitor)
 
 //_________________
 fxtEventCutMonitor::fxtEventCutMonitor(){
-  mVertexYvsVertexX = new StHbt2FHisto("VertexYvsVertexX",
-				       "VertexYvsVertexX;x (cm);y (cm)", 
+  mVertexYvsVertexX = new StHbt2FHisto("VertexYvsVertexX", "VertexYvsVertexX;x (cm);y (cm)", 
 				       300, -6.,6., 300, -6.,6.);
-  mVertexZ = new StHbt1FHisto("VertexZ", "VertexZ; z (cm)",
-			      320, -80., 80.);
-  mRefMult = new StHbt1FHisto("RefMult", "RefMult;RefMult",
-			      600, -0.5, 599.5);
-  mVpdVzDiff = new StHbt1FHisto("VpdVzDiff", "mVpdVzDiff",
-				40, -20., 20.);
+  mVertexZ = new StHbt1FHisto("VertexZ", "VertexZ; z (cm)", 320, -80., 80.);
+  mRefMult = new StHbt1FHisto("RefMult", "RefMult;RefMult", 500, 0.,500);
+  mVpdVzDiff = new StHbt1FHisto("VpdVzDiff", "mVpdVzDiff", 40, -20., 20.);
 }
 
 //_________________
@@ -34,7 +30,7 @@ fxtEventCutMonitor::fxtEventCutMonitor(const char* title1, const char* title2){
 			      320, -80., 80.);
 
   sprintf(tit1,"%s%s_RefMult",title1,title2);
-  mRefMult = new StHbt1FHisto(tit1, "RefMult;RefMult", 600, 0., 600.);
+  mRefMult = new StHbt1FHisto(tit1, "RefMult;RefMult", 500, 0., 500.);
 
   sprintf(tit1,"%s%s_VpdVzDiff",title1,title2);
   mVpdVzDiff = new StHbt1FHisto(tit1, "VpdVzDiff", 40, -20., 20.);
@@ -60,14 +56,10 @@ void fxtEventCutMonitor::Fill(const StHbtEvent* event){
 
 //_________________
 void fxtEventCutMonitor::Finish(){
-  std::cout << " entries in histogram mVertexYvsVertexX : "
-	    << mVertexYvsVertexX->Integral() << std::endl;
-  std::cout << " entries in histogram mVertexZ : "
-	    << mVertexZ->Integral() << std::endl;
-  std::cout << " entries in histogram mRefMult : "
-	    << mRefMult->Integral() << std::endl;
-  std::cout << " entries in histogram mVpdVzDiff : "
-	    << mVpdVzDiff->Integral() << std::endl;
+  cout << " entries in histogram mVertexYvsVertexX : " << mVertexYvsVertexX->Integral() << endl;
+  cout << " entries in histogram mVertexZ : " << mVertexZ->Integral() << endl;
+  cout << " entries in histogram mRefMult : " << mRefMult->Integral() << endl;
+  cout << " entries in histogram mVpdVzDiff : " << mVpdVzDiff->Integral() << endl;
 }
 
 //_________________

+ 4 - 4
StRoot/StHbtMaker/Cut/fxtTrackCutMonitor.cxx

@@ -42,7 +42,7 @@ fxtTrackCutMonitor::fxtTrackCutMonitor(const char* name,
   mPseudoRapidity = new StHbt1FHisto( (s+n+"mPseudoRapidity").c_str(),
 				      "PseudoRapidity;#eta",
 				      120, -1.2, 1.2);
-  mPvsMassSqr = new StHbt2FHisto( (s+n+"mPvsMassSqr").c_str(),
+  mPtVsMassSqr = new StHbt2FHisto( (s+n+"mPtVsMassSqr").c_str(),
 				  "p_{T} vs m^{2};p_{T} (GeV/c);m^{2} (GeV/c^{2})^{2}",
 				   180,0.,1.8,120, -0.1, 1.1);
   mPvsInvBeta = new StHbt2FHisto( (s+n+"mPvsInvBeta").c_str(),
@@ -62,7 +62,7 @@ fxtTrackCutMonitor::fxtTrackCutMonitor( const  fxtTrackCutMonitor& cutMoni)  {
   mPvsDedx =new StHbt2FHisto(*(cutMoni.mPvsDedx));
   mRapidity= new StHbt1FHisto(*(cutMoni.mRapidity));
   mPseudoRapidity= new StHbt1FHisto(*(cutMoni.mPseudoRapidity));
-  mPvsMassSqr = new StHbt2FHisto(*(cutMoni.mPvsMassSqr));
+  mPtVsMassSqr = new StHbt2FHisto(*(cutMoni.mPtVsMassSqr));
   mPvsInvBeta = new StHbt2FHisto(*(cutMoni.mPvsInvBeta));
 }
 
@@ -78,7 +78,7 @@ fxtTrackCutMonitor::~fxtTrackCutMonitor(){
   delete mPvsDedx ;
   delete mRapidity;
   delete mPseudoRapidity;
-  delete mPvsMassSqr;
+  delete mPtVsMassSqr;
   delete mPvsInvBeta;
 }
 
@@ -103,7 +103,7 @@ void  fxtTrackCutMonitor::Fill(const StHbtTrack* track){
   mPvsDedx->Fill( fabs(track->P().mag())*track->Charge(), track->dEdx()*1000000, 1.);
   mRapidity->Fill(TRapidity, 1.);
   mPseudoRapidity->Fill(TEta, 1.);
-  mPvsMassSqr->Fill(track->P().mag(), track->TofMassSqr(), 1.);
+  mPtVsMassSqr->Fill(track->Pt(), track->TofMassSqr(), 1.);
   mPvsInvBeta->Fill( fabs(track->P().mag())*track->Charge(), 
 		     (1./track->TofBeta()), 1.);
 }

+ 4 - 5
StRoot/StHbtMaker/Cut/fxtTrackCutMonitor.h

@@ -6,10 +6,9 @@ class StHbtTrack;
 #include "StHbtMaker/Infrastructure/StHbtHisto.hh"
 #include "StHbtMaker/Base/StHbtCutMonitor.hh"
 
-//_________________
 class fxtTrackCutMonitor : public StHbtCutMonitor {
 
- private:
+private:
   StHbt1FHisto* mDCAGlobal;
   StHbt1FHisto* mNhits;
   StHbt1FHisto* mP;
@@ -20,7 +19,7 @@ class fxtTrackCutMonitor : public StHbtCutMonitor {
   StHbt2FHisto* mPvsDedx;
   StHbt1FHisto* mRapidity;
   StHbt1FHisto* mPseudoRapidity;
-  StHbt2FHisto* mPvsMassSqr;
+  StHbt2FHisto* mPtVsMassSqr;
   StHbt2FHisto* mPvsInvBeta;
   double monMass;
   
@@ -51,11 +50,11 @@ public:
   StHbt2FHisto* PvsDedx() { return mPvsDedx; }
   StHbt1FHisto* Rapidity() { return mRapidity; }
   StHbt1FHisto* PseudoRapidity() { return mPseudoRapidity; }
-  StHbt2FHisto* PvsMassSqr() { return mPvsMassSqr; }
+  StHbt2FHisto* PtVsMassSqr() { return mPtVsMassSqr; }
   StHbt2FHisto* PvsInvBeta() {return mPvsInvBeta; }
   
 #ifdef __ROOT__  
- ClassDef(fxtTrackCutMonitor, 2)
+ ClassDef(fxtTrackCutMonitor, 1)
 #endif
 };
 

+ 2 - 2
StRoot/StHbtMaker/Cut/gregsEventCut.cxx

@@ -22,9 +22,9 @@ gregsEventCut::gregsEventCut() {
   mVzVpdVzDiff[1] = +50;
   //0-pp; 1-AuAu
   mCollisionType = 0;
-  mNumberOfCentralityBins = 9;
+  mNumberOfCentralityBins = 16;
   mCentralityBinRange[0] = 0;
-  mCentralityBinRange[1] = 8;
+  mCentralityBinRange[1] = 15;
   mRefMultCorrUtil_curInitRunNumber = -1;
   mUseZdcRefMultCorr = false;
   //Do not forget to add: gSystem->Load("StRefMultCorr"); in the running macro

+ 2 - 2
StRoot/StHbtMaker/Fit/.consign

@@ -1,2 +1,2 @@
-dFitter3d.h:1432557383 - a92bd1ce9df8645819a23f1c045d878d
-dProjector.h:1432557384 - 729f9f6c99f8cc3522e53d0e4833e1ab
+dFitter3d.h:1499277872 - a92bd1ce9df8645819a23f1c045d878d
+dProjector.h:1499277872 - 729f9f6c99f8cc3522e53d0e4833e1ab

+ 63 - 63
StRoot/StHbtMaker/Infrastructure/.consign

@@ -1,63 +1,63 @@
-StHbtVertexAnalysis.h:1432557369 - 15009269909a9f453855705eee331178
-StHbtTTreeKink.h:1432557362 - d205f26343b0bb009d0d6fde35345c19
-StHbtTTreeV0.h:1432557348 - 5dc230ced4476d6dd7b7792656c26706
-StHbtTTreeEvent.h:1432557355 - b78a2837736a13f43946b6d7dd3afe8b
-StHbtVertexMultAnalysis.h:1432557352 - afcd7bdfef949fcef07c741aaf3ab7b1
-StHbtHistoCollector.h:1432557357 - 7cb3fced8e9e43edfa169037da1415c3
-StHbtSmearPair.h:1432557374 - 7942cb14639b5aa507d84bb33be9ec62
-StHbtManager.h:1432557378 - 1e49cd04a093f68883d45b15b6204dc0
-StHbtNamed.hh:1432557363 - 536158773ab4d66ccd7bb2665aa25975
-StHbtVector.hh:1432557357 - 488020fbef9428dd949dec3d54ca8ef1
-StHbtPairCutCollection.hh:1432557373 - fde1727c1eeacce97c3d0a16feab4f14
-StParityAnalysis.h:1432557370 - 8b6b9b83e8d4e09bf07e0e26f4e14e5d
-StHbtKink.hh:1432557374 - f8950df6a85a9ab57a16acdc16e535bb
-StHbtSplitEvalAnalysis.h:1432557381 - 6e04abfccb79680b8632afb5eb44bdb4
-StHbtKinkCollection.hh:1432557358 - 1ebbe4fb3ac6381078c42894882e713c
-StHbtSectoredPicoEventCollection.hh:1432557366 - 47dcc79ecb2ba1d47ce4c844fca39d07
-StHbtAnalysisCollection.hh:1432557359 - 36b7764ce7e228dc8e6d6d307cfc88b0
-StHbtPicoEventCollectionVectorHideAway.hh:1432557371 - 74e45f34dadbd02e5f711713360f7269
-StHbtCutMonitorCollection.hh:1432557365 - a9c4aef4f5b4662a4ffcf645e3de14b3
-StHbtTrackCutCollection.hh:1432557363 - ce62856c42bf65d30df7cf6bc68e13cf
-StHbtCoulomb.h:1432557358 - dacda678e20eb586c7f9605949e89b06
-StHbtParticle.hh:1432557362 - c21e5bf520ea25c9807174bdf44706b3
-CTHCollection.hh:1432557365 - fb722494df925ff010a4a99a55ee4150
-StParityTypes.hh:1432557353 - 0eda0f11ab61e29941844caf744c817c
-StHbtSectoredAnalysis.h:1432557361 - bc8c77381328a432932309963cacc636
-StHbtV0Collection.hh:1432557354 - 18353d67510d22ec7f53cef85ae9948f
-StHbtEnumeration.hh:1432557368 - f3fc5d6e23989568a69e55e3152dffcd
-StHbtPair.hh:1432557356 - 67ffea9cd0a03032f88ca8e908e1b6ee
-StHbtTriplet.hh:1432557379 - ea13154963cb16050245464459d26b0a
-StHbtTagWriter.hh:1432557374 - f579c73a8d466b34ac2c7ea60b7893f0
-StHbtString.hh:1432557350 - ed861a447aa3dea6c586a0988504a0c8
-StHbtXi.hh:1432557379 - 5a3f2905f4c76bbe04a35f1fe49ba867
-StHbtSectoredPicoEvent.hh:1432557366 - f5d0f2e99f213c2b48234ab4c9c13c51
-StHbtPicoEventCollection.hh:1432557372 - 47834c24b5b75dd762be08d569c85f51
-StHbtThreeParticleAnalysis.h:1432557370 - 5d51508f2ea868f383440e58a0719ac7
-StHbtParticleCollection.hh:1432557377 - f184a6d4e9abbead3354e3e590989016
-StHbtPicoEventCollectionVector.hh:1432557376 - a3688e12da9e4252d26506d2684fa13f
-StHbtV0.hh:1432557361 - 5ef3dd9a621e7c61fb9ca0bbf1386948
-StHbtEventWriterCollection.hh:1432557352 - 8524ce1427a2aaae725282cb8d519398
-StHbtTypes.hh:1432557348 - 59acf381af56eb01b27be09b4f6bf22f
-StHbtHelix.hh:1432557379 - bd0c6545c0f78a4cc02bd0f4029047cd
-StHbtPicoEvent.hh:1432557353 - 2b3685004d2c9c3ae1e4b70b8ff9e87e
-StHbtCorrFctnCollection.hh:1432557351 - be0147388ed067a605e18707c85b0654
-StHbtLikeSignAnalysis.h:1432557363 - f19093fc44f01b2909d6d2d4cbb85c7c
-StHbtIOBinary.hh:1432557352 - f263ea0d47818dd8ca93e45cec52784c
-StExceptions.hh:1432557378 - d07dcdc0ecf1105fd804a06d568b158a
-StHbtReactionPlaneAnalysis.h:1432557353 - 2f531fd6f641e0b5383ea7b3053a8238
-StHbtEvent.hh:1432557350 - 31d9987cef5ca887b340eb51185a7bd8
-CTH.hh:1432557356 - f98aa5f8c022cb4bfee1477d40e2e015
-StHbtTrackCollection.hh:1432557355 - 69d4e458be719638c7546b4dc10a3ef8
-StHbtAihongPid.h:1432557364 - b3f7ce1a7163de4bbdff84a7d7f8a515
-StHbtCutMonitorHandler.h:1432557360 - 753bac7372b1fde6f7d14e5ca1f209d1
-StHbtMultiTrackCut.h:1432557373 - f47e13fa1921822c7be90a1d2421326a
-StHbtTrack.hh:1432557349 - c34323b6b200b082e5aecb6467939cf0
-StHbtTTreeXi.h:1432557371 - 43a94609ea06c241812a51b2f9838fd7
-StHbtXiCollection.hh:1432557351 - ebf1422d334db48a9d4a4e7c4bbdb161
-StHbtCheckPdgIdList.h:1432557380 - 971c36566d3b4e1783ea47f2a5e95850
-StHbtTFile.hh:1432557360 - 51a6f2a5c906d42af2c071de2a457035
-franks1HistoD.hh:1432557348 - bc6b62ac788a03665462ed52f4355f46
-StHbtHisto.hh:1432557365 - 7a45dcb6fc1204ab27c6668e102926f6
-franks2HistoD.hh:1432557364 - b4523720aa50d47b2bb24226875affe2
-StHbtAnalysis.h:1432557357 - 83de619170fbe8113064578f0611def3
-StHbtTTreeTrack.h:1432557376 - 48fcca5a4173b6e1886919c9731bdc9c
+StHbtVertexAnalysis.h:1499277868 - 15009269909a9f453855705eee331178
+StHbtTTreeKink.h:1499277868 - d205f26343b0bb009d0d6fde35345c19
+StHbtTTreeV0.h:1499277870 - 5dc230ced4476d6dd7b7792656c26706
+StHbtTTreeEvent.h:1499277869 - b78a2837736a13f43946b6d7dd3afe8b
+StHbtVertexMultAnalysis.h:1499277869 - afcd7bdfef949fcef07c741aaf3ab7b1
+StHbtHistoCollector.h:1499277868 - 7cb3fced8e9e43edfa169037da1415c3
+StHbtSmearPair.h:1499277869 - 7942cb14639b5aa507d84bb33be9ec62
+StHbtManager.h:1499277870 - 1e49cd04a093f68883d45b15b6204dc0
+StHbtNamed.hh:1499277868 - 536158773ab4d66ccd7bb2665aa25975
+StHbtVector.hh:1499277869 - 488020fbef9428dd949dec3d54ca8ef1
+StHbtPairCutCollection.hh:1499277870 - fde1727c1eeacce97c3d0a16feab4f14
+StParityAnalysis.h:1499277870 - 8b6b9b83e8d4e09bf07e0e26f4e14e5d
+StHbtKink.hh:1499277869 - f8950df6a85a9ab57a16acdc16e535bb
+StHbtSplitEvalAnalysis.h:1499277869 - 6e04abfccb79680b8632afb5eb44bdb4
+StHbtKinkCollection.hh:1499277870 - 1ebbe4fb3ac6381078c42894882e713c
+StHbtSectoredPicoEventCollection.hh:1499277869 - 47dcc79ecb2ba1d47ce4c844fca39d07
+StHbtAnalysisCollection.hh:1499277868 - 36b7764ce7e228dc8e6d6d307cfc88b0
+StHbtPicoEventCollectionVectorHideAway.hh:1499277869 - 74e45f34dadbd02e5f711713360f7269
+StHbtCutMonitorCollection.hh:1499277869 - a9c4aef4f5b4662a4ffcf645e3de14b3
+StHbtTrackCutCollection.hh:1499277870 - ce62856c42bf65d30df7cf6bc68e13cf
+StHbtCoulomb.h:1499277870 - dacda678e20eb586c7f9605949e89b06
+StHbtParticle.hh:1499277870 - 37b57f3d54d4d11cb8d59af446a7c32d
+CTHCollection.hh:1499277868 - fb722494df925ff010a4a99a55ee4150
+StParityTypes.hh:1499277869 - 0eda0f11ab61e29941844caf744c817c
+StHbtSectoredAnalysis.h:1499277869 - bc8c77381328a432932309963cacc636
+StHbtV0Collection.hh:1499277868 - 18353d67510d22ec7f53cef85ae9948f
+StHbtEnumeration.hh:1499277868 - f3fc5d6e23989568a69e55e3152dffcd
+StHbtPair.hh:1499277868 - 67ffea9cd0a03032f88ca8e908e1b6ee
+StHbtTriplet.hh:1499277868 - ea13154963cb16050245464459d26b0a
+StHbtTagWriter.hh:1499277869 - f579c73a8d466b34ac2c7ea60b7893f0
+StHbtString.hh:1499277868 - ed861a447aa3dea6c586a0988504a0c8
+StHbtXi.hh:1499277869 - 5a3f2905f4c76bbe04a35f1fe49ba867
+StHbtSectoredPicoEvent.hh:1499277868 - f5d0f2e99f213c2b48234ab4c9c13c51
+StHbtPicoEventCollection.hh:1499277869 - 47834c24b5b75dd762be08d569c85f51
+StHbtThreeParticleAnalysis.h:1499277868 - 5d51508f2ea868f383440e58a0719ac7
+StHbtParticleCollection.hh:1499277868 - f184a6d4e9abbead3354e3e590989016
+StHbtPicoEventCollectionVector.hh:1499277868 - a3688e12da9e4252d26506d2684fa13f
+StHbtV0.hh:1499277868 - 255f5a3c741e6c24273eec97f6ba0688
+StHbtEventWriterCollection.hh:1499277868 - 8524ce1427a2aaae725282cb8d519398
+StHbtTypes.hh:1499277870 - 59acf381af56eb01b27be09b4f6bf22f
+StHbtHelix.hh:1499277868 - bd0c6545c0f78a4cc02bd0f4029047cd
+StHbtPicoEvent.hh:1499277868 - 2b3685004d2c9c3ae1e4b70b8ff9e87e
+StHbtCorrFctnCollection.hh:1499277869 - be0147388ed067a605e18707c85b0654
+StHbtLikeSignAnalysis.h:1499277868 - f19093fc44f01b2909d6d2d4cbb85c7c
+StHbtIOBinary.hh:1499277868 - f263ea0d47818dd8ca93e45cec52784c
+StExceptions.hh:1499277870 - d07dcdc0ecf1105fd804a06d568b158a
+StHbtReactionPlaneAnalysis.h:1499277868 - 2f531fd6f641e0b5383ea7b3053a8238
+StHbtEvent.hh:1499277868 - b1cbc59f336779eb7f598505d3d1942e
+CTH.hh:1499277869 - f98aa5f8c022cb4bfee1477d40e2e015
+StHbtTrackCollection.hh:1499277869 - 69d4e458be719638c7546b4dc10a3ef8
+StHbtAihongPid.h:1499277868 - b3f7ce1a7163de4bbdff84a7d7f8a515
+StHbtCutMonitorHandler.h:1499277869 - 753bac7372b1fde6f7d14e5ca1f209d1
+StHbtMultiTrackCut.h:1499277870 - f47e13fa1921822c7be90a1d2421326a
+StHbtTrack.hh:1499277868 - be8e98081e64e494c67a026ffac63ad0
+StHbtTTreeXi.h:1499277869 - 43a94609ea06c241812a51b2f9838fd7
+StHbtXiCollection.hh:1499277868 - ebf1422d334db48a9d4a4e7c4bbdb161
+StHbtCheckPdgIdList.h:1499277868 - 971c36566d3b4e1783ea47f2a5e95850
+StHbtTFile.hh:1499277868 - 51a6f2a5c906d42af2c071de2a457035
+franks1HistoD.hh:1499277870 - bc6b62ac788a03665462ed52f4355f46
+StHbtHisto.hh:1499277868 - 5086fd0ae55f5211e547737073cfd049
+franks2HistoD.hh:1499277868 - b4523720aa50d47b2bb24226875affe2
+StHbtAnalysis.h:1499277870 - 83de619170fbe8113064578f0611def3
+StHbtTTreeTrack.h:1499277868 - 48fcca5a4173b6e1886919c9731bdc9c

+ 1 - 5
StRoot/StHbtMaker/Infrastructure/StHbtAnalysis.cxx

@@ -504,11 +504,7 @@ void StHbtAnalysis::MakePairs(const char* typeIn, StHbtParticleCollection *partC
 	    }
 
 	  } //for (CorrFctnIter=mCorrFctnCollection->begin() ...
-	}
-  else 
-  {
-    std::cout << "bad pair\n";
-  }  //if (mPairCut->Pass(ThePair))
+	} //if (mPairCut->Pass(ThePair))
       } //if(tmpPassPair )
 
     }    // loop over second particle

+ 22 - 35
StRoot/StHbtMaker/Infrastructure/StHbtTrack.cc

@@ -87,7 +87,7 @@ StHbtTrack::StHbtTrack(const StHbtTrack& t) { // copy constructor
   mCharge = t.mCharge;
   mFlag = t.mFlag;     
   mNHits = t.mNHits;
-  //mNHitsFit = t.mNHitsFit;
+  mNHitsFit = t.mNHitsFit;
   mNHitsPoss = t.mNHitsPoss;
   mNHitsDedx = t.mNHitsDedx;
   mNSigmaElectron = t.mNSigmaElectron;
@@ -113,10 +113,10 @@ StHbtTrack::StHbtTrack(const StHbtTrack& t) { // copy constructor
   mMap[1] = t.mMap[1];
 
   mTofBeta = t.mTofBeta;
-  //mXfr = t.mXfr;
-  //mYfr = t.mYfr;
-  //mZfr = t.mZfr;
-  //mTfr = t.mTfr;
+  mXfr = t.mXfr;
+  mYfr = t.mYfr;
+  mZfr = t.mZfr;
+  mTfr = t.mTfr;
 
   if (t.ValidHiddenInfo())
     mHiddenInfo = t.getHiddenInfo()->clone();
@@ -147,19 +147,6 @@ void StHbtTrack::SetCharge(const short& ch) {
 }
 
 //_________________
-short StHbtTrack::NHitsFit() const {
-  if(mTrackType == 0) {
-    return (short)mNHits;
-  }
-  else if(mTrackType == 1) {
-    return (short)(mNHits+1);
-  }
-  else {
-    return -9;
-  }
-}
-
-//_________________
 short StHbtTrack::Charge() const {
   if(mCharge == false) {
     return -1;
@@ -246,10 +233,10 @@ StHbtTrack::StHbtTrack(const StTrack* ST, StHbtThreeVector PrimaryVertex) {
   mMap[1] = ST->topologyMap().data(1);
   mTrackId = (unsigned short)ST->key();
 
-  //mXfr = 0.;
-  //mYfr = 0.;
-  //mZfr = 0.;
-  //mZfr = 0.;
+  mXfr = 0.;
+  mYfr = 0.;
+  mZfr = 0.;
+  mZfr = 0.;
 }
 
 //_________________
@@ -339,10 +326,10 @@ StHbtTrack::StHbtTrack(const StEvent* EV, const StTrack* ST) {
     mPidProbProton=  (localCharge>0) ? aihongPid->beingProtonProb() : aihongPid->beingAntiProtonProb(); 
   }
 
-  //mXfr = 0.;
-  //mYfr = 0.;
-  //mZfr = 0.;
-  //mZfr = 0.;
+  mXfr = 0.;
+  mYfr = 0.;
+  mZfr = 0.;
+  mZfr = 0.;
 }
 
 //_________________
@@ -465,10 +452,10 @@ StHbtTrack::StHbtTrack(const StHbtTTreeEvent* ev,
   }
   mHiddenInfo = 0;
 
-  //mXfr = 0.;
-  //mYfr = 0.;
-  //mZfr = 0.;
-  //mZfr = 0.;
+  mXfr = 0.;
+  mYfr = 0.;
+  mZfr = 0.;
+  mZfr = 0.;
 };
 
 //________________
@@ -490,7 +477,7 @@ StHbtTrack::StHbtTrack(const StMuDst* dst, const StMuTrack* t) {
   mNHits = (unsigned char)( t->topologyMap().numberOfHits(kTpcId) + 
 			    t->topologyMap().numberOfHits(kFtpcEastId) + 
 			    t->topologyMap().numberOfHits(kFtpcWestId) );
-  //mNHitsFit = (unsigned char)t->nHitsFit();
+  mNHitsFit = (unsigned char)t->nHitsFit();
   mNHitsPoss = (unsigned char)t->nHitsPoss(); 
   mNHitsDedx = (unsigned char)t->nHitsDedx();
 
@@ -561,10 +548,10 @@ StHbtTrack::StHbtTrack(const StMuDst* dst, const StMuTrack* t) {
   //
   // added by nik
   //
-  //mXfr = 0.;
-  //mYfr = 0.;
-  //mZfr = 0.;
-  //mTfr = 0.;
+  mXfr = 0.;
+  mYfr = 0.;
+  mZfr = 0.;
+  mTfr = 0.;
 };
 
 #endif

+ 15 - 16
StRoot/StHbtMaker/Infrastructure/StHbtTrack.hh

@@ -155,7 +155,7 @@ public:
   short Charge() const;
   short Flag() const      {return mFlag;}
   short NHits() const     {return (short)mNHits;}
-  short NHitsFit() const; 
+  short NHitsFit() const  {return (short)mNHitsFit;}
   short NHitsPossible() const  {return (short)mNHitsPoss;}
   short NHitsDedx() const {return (short)mNHitsDedx;}
   float NSigmaElectron() const {return mNSigmaElectron;}
@@ -185,10 +185,10 @@ public:
   float TofBeta() const {return mTofBeta;}
   float TofMassSqr() const;
   //Return particle parameters at freeze-out (for simulation only)
-  //float FreezeOutX() const {return mXfr;}
-  //float FreezeOutY() const {return mYfr;}
-  //float FreezeOutZ() const {return mZfr;}
-  //float FreezeOutT() const {return mTfr;}
+  float FreezeOutX() const {return mXfr;}
+  float FreezeOutY() const {return mYfr;}
+  float FreezeOutZ() const {return mZfr;}
+  float FreezeOutT() const {return mTfr;}
   
   ///////////////
   //  Setters  //
@@ -198,8 +198,7 @@ public:
   void SetCharge(const short& charge);
   void SetFlag(const short& fl)          {mFlag = (short)fl;}            
   void SetNHits(const short& nh)         {mNHits = (unsigned char)nh;}
-  //void SetNHitsFit(const short& nh)      { /* tmp */ }
-  //void SetNHitsFit(const short& nh)      {mNHitsFit = (unsigned char)nh;}
+  void SetNHitsFit(const short& nh)      {mNHitsFit = (unsigned char)nh;}
   void SetNHitsPossible(const short& nh) {mNHitsPoss = (unsigned char)nh;}
   void SetNHitsDedx(const short& nh)     {mNHitsDedx = (unsigned char)nh;}
   void SetNSigmaElectron(const float& ns) {mNSigmaElectron = ns;}
@@ -226,10 +225,10 @@ public:
   //ToF beta
   void SetTofBeta(const float &t) {mTofBeta = t;}
   //Freeze-out parameters (for the simulation only)
-  //void SetFreezeOutX(const float &x) {mXfr = x;}
-  //void SetFreezeOutY(const float &y) {mYfr = y;}
-  //void SetFreezeOutZ(const float &z) {mZfr = z;}
-  //void SetFreezeOutT(const float &t) {mTfr = t;}
+  void SetFreezeOutX(const float &x) {mXfr = x;}
+  void SetFreezeOutY(const float &y) {mYfr = y;}
+  void SetFreezeOutZ(const float &z) {mZfr = z;}
+  void SetFreezeOutT(const float &t) {mTfr = t;}
 
   /* Th stuff */
   void SetHiddenInfo(StHbtHiddenInfo* aHiddenInfo) {mHiddenInfo = aHiddenInfo;}
@@ -249,7 +248,7 @@ private:
   short mFlag;               //if flag<0 then this is a bad track. The definition comes from StEvent
   unsigned char mNHits;      //nHits*charge
   unsigned char mNHitsPoss;  
-  //unsigned char mNHitsFit;   //if(global) {nHitsFit=nHits} if(primary) {nHitsFit=nHits+1}
+  unsigned char mNHitsFit;
   unsigned char mNHitsDedx;
   float mNSigmaElectron;
   float mNSigmaPion;
@@ -277,10 +276,10 @@ private:
   StPhysicalHelixD mHelixGlobal;
 
   //Particle positions at freeze-out (for MC only)
-  //float mXfr;
-  //float mYfr;
-  //float mZfr;
-  //float mTfr;
+  float mXfr;
+  float mYfr;
+  float mZfr;
+  float mTfr;
 
   /* Th stuff */
   // Fab private : add mutable

+ 5 - 4
StRoot/StHbtMaker/Infrastructure/StHbtV0.cc

@@ -25,7 +25,7 @@ StHbtV0::StHbtV0(const StHbtV0& v) { // copy constructor
   mTrackTopologyMapPos[0] = v.mTrackTopologyMapPos[0];
   mTrackTopologyMapPos[1] = v.mTrackTopologyMapPos[1];
   mTpcHitsPos = v.mTpcHitsPos;
-  //mNHitsFitPos = v.mNHitsFitPos;
+  mNHitsFitPos = v.mNHitsFitPos;
   mNHitsPossiblePos = v.mNHitsPossiblePos;
   mNumDedxPos = v.mNumDedxPos;
   mChi2Pos = v.mChi2Pos;
@@ -44,10 +44,10 @@ StHbtV0::StHbtV0(const StHbtV0& v) { // copy constructor
   mDcaNegToPrimVertex = v.mDcaNegToPrimVertex;
   mMomNeg = v.mMomNeg;
   mHelixNeg = v.mHelixNeg;
-  mTrackTopologyMapNeg[0] = v. mTrackTopologyMapNeg[0];
+  mTrackTopologyMapNeg[0] = v.mTrackTopologyMapNeg[0];
   mTrackTopologyMapNeg[1] = v.mTrackTopologyMapNeg[1];
   mTpcHitsNeg = v.mTpcHitsNeg;
-  //mNHitsFitNeg = v.mNHitsFitNeg;
+  mNHitsFitNeg = v.mNHitsFitNeg;
   mNHitsPossibleNeg = v.mNHitsPossibleNeg;
   mNumDedxNeg = v.mNumDedxNeg;
   mChi2Neg = v.mChi2Neg;
@@ -72,7 +72,8 @@ void StHbtV0::UpdateV0(){
   //Calc. derived memebers of the v0 class
   float MomNegAlongV0, MomPosAlongV0;
   float mPtotV0 = mMomV0.mag();
-  float mPtotPos = mMomPos.mag();  //Only positive is needed for the mPtArmV0
+  float mPtotPos = mMomPos.mag();
+  float mPtotNeg = mMomNeg.mag();
 
   mMomV0  = mMomPos + mMomNeg;
   MomNegAlongV0 =  mMomNeg*mMomV0 / ::sqrt(::pow(mPtotV0,2));

+ 6 - 6
StRoot/StHbtMaker/Infrastructure/StHbtV0.hh

@@ -158,7 +158,7 @@ class StHbtV0 {
   float errdedxPos() const   { return mErrDedxPos; }       // error on dedx of Positive track--Gael04Fev 2002
   float lendedxPos() const   { return mLenDedxPos; }       // Length of dE/dX track of pos. daughter--Gael04Fev 2002          
   unsigned short tpcHitsPos() const       { return (unsigned short)mTpcHitsPos; }  // Number of TPC hits on pos. daughter
-  unsigned short nHitsFitPos() const      { return (unsigned short)mTpcHitsPos; } 
+  unsigned short nHitsFitPos() const      { return (unsigned short)mNHitsFitPos; } 
   unsigned short nHitsPossiblePos() const { return (unsigned short)mNHitsPossiblePos; }
   unsigned short nHitsDedxPos() const     { return (unsigned short)mNumDedxPos; }
   StHbtThreeVector momPos() const  {return mMomPos;}    // Momentum components of pos. daughter
@@ -188,7 +188,7 @@ class StHbtV0 {
   float errdedxNeg() const   { return mErrDedxNeg; }       // error on dedx of Negative track--Gael04Fev 2002
   float lendedxNeg() const   { return mLenDedxNeg; }       // Length of dE/dX track of neg. daughter--Gael04Fev 2002
   unsigned short tpcHitsNeg() const       { return (unsigned short)mTpcHitsNeg; }       // Number of TPC hits on neg. daughter
-  unsigned short nHitsFitNeg() const      { return (unsigned short)mTpcHitsNeg; }
+  unsigned short nHitsFitNeg() const      { return (unsigned short)mNHitsFitNeg; }
   unsigned short nHitsPossibleNeg() const { return (unsigned short)mNHitsPossibleNeg; }
   unsigned short nHitsDedxNeg() const     { return (unsigned short)mNumDedxNeg; }
   StHbtThreeVector momNeg() const  { return mMomNeg; }    // Momentum components of neg. daughter
@@ -241,7 +241,7 @@ class StHbtV0 {
   void SetmomPosY(const float py)          { mMomPos.setY(py); }
   void SetmomPosZ(const float pz)          { mMomPos.setZ(pz); }
   void SettpcHitsPos(const unsigned short n)       { mTpcHitsPos = (unsigned char)n;}
-  //void SetnHitsFitPos(const unsigned short n)      { mNHitsFitPos = (unsigned char)n;}
+  void SetnHitsFitPos(const unsigned short n)      { mNHitsFitPos = (unsigned char)n;}
   void SetnHitsPossiblePos(const unsigned short n) { mNHitsPossiblePos = (unsigned char)n;}
   void SetnHitsDedxPos(const unsigned short n)     { mNumDedxPos = (unsigned char)n; }
   void SetdedxPos(const float x)      { mDedxPos = x; }
@@ -266,7 +266,7 @@ class StHbtV0 {
   void SetmomNegY(const float py)           { mMomNeg.setY(py); }
   void SetmomNegZ(const float pz)           { mMomNeg.setZ(pz); }
   void SettpcHitsNeg(const unsigned short n)        { mTpcHitsNeg = (unsigned char)n; }
-  //void SetnHitsFitNeg(const unsigned short n)       { mNHitsFitNeg = (unsigned char)n; }
+  void SetnHitsFitNeg(const unsigned short n)       { mNHitsFitNeg = (unsigned char)n; }
   void SetnHitsPossibleNeg(const unsigned short n)  { mNHitsPossibleNeg = (unsigned char)n; }
   void SetnHitsDedxNeg(const unsigned short n)      { mNumDedxNeg = (unsigned char)n; }
   void SetdedxNeg(const float x)     { mDedxNeg = x; }
@@ -320,7 +320,7 @@ class StHbtV0 {
   StPhysicalHelixD mHelixPos;
   unsigned int  mTrackTopologyMapPos[2];
   unsigned char mTpcHitsPos;
-  //unsigned char mNHitsFitPos;
+  unsigned char mNHitsFitPos;
   unsigned char mNHitsPossiblePos;
   unsigned char mNumDedxPos;
   float mChi2Pos;
@@ -344,7 +344,7 @@ class StHbtV0 {
   unsigned int  mTrackTopologyMapNeg[2];  
   unsigned char mTpcHitsNeg;
   unsigned char mNumDedxNeg;
-  //unsigned char mNHitsFitNeg;
+  unsigned char mNHitsFitNeg;
   unsigned char mNHitsPossibleNeg;
   float mChi2Neg;
   float mClNeg;

+ 18 - 16
StRoot/StHbtMaker/Reader/.consign

@@ -1,17 +1,19 @@
-AliStHbtEvent.h:1432557396 - fb77890694ad0025315f8e9c8cca7615
-StHbtAssociationReader.h:1432557395 - 9e38754971468652881fafcffcf16fa8
-StHbtMuDstMakerReader.h:1432557394 - 5a26d016d2b6fc11c336430767bdfc57
-StHbtFlowPicoReader.h:1432557393 - 153e9de03545843c68b0bc9419fc7183
-AliStHbtEventReader.h:1432557392 - 9ee3d8fd80a17e54677660481c2d308a
-StHbtStrangeMuDstEventReader.h:1432557392 - 912504a0309ac4fe702e928b0cf1ea6f
-StHbtGstarTxtReader.h:1432557388 - 239f038a1c71ede7a221f3e711b17d70
+StHbtAssociationReader.h:1499277863 - 9e38754971468652881fafcffcf16fa8
+AliStHbtEvent.h:1499277863 - fb77890694ad0025315f8e9c8cca7615
+StHbtMuDstMakerReader.h:1499277863 - a15e4dfd5416c9232c18b20e0f4b318b
+StHbtFlowPicoReader.h:1499277863 - 153e9de03545843c68b0bc9419fc7183
+AliStHbtEventReader.h:1499277863 - 9ee3d8fd80a17e54677660481c2d308a
+StHbtStrangeMuDstEventReader.h:1499277863 - 912504a0309ac4fe702e928b0cf1ea6f
+StHbtGstarTxtReader.h:1499277863 - 239f038a1c71ede7a221f3e711b17d70
 StHbtPythiaDstReader.h:1432557387 - 1a60af940c11a6d2d5a6d736e049eee0
-StStandardHbtEventReader.h:1432557396 - 642ab7526d18d2c7c8608d73744c7fc1
-StHbtAsciiReader.h:1432557393 - 474b59af2897dd646c006cb906657ab7
-StHbtMuDstReader.h:1432557386 - 9d345748df4e72f023d5fd7e71745478
-flow_pDST.h:1432557396 - 378b4b7160da82f3ffd3cfbe1a551088
-StHbtBinaryReader.h:1432557393 - ba5776166eed54486e042c53ebbf0795
-StHbtMcEventReader.h:1432557393 - d93f371a02b5b2757ededc9dfae90df4
-StHbtTTreeReader.h:1432557388 - 6280e972c6a8ed046bd95890606a7ab2
-StHbtTagReader.h:1432557389 - 62bb6afecdeaf466fe45d09cea675b22
-AliStHbtTrack.h:1432557387 - 57b62d4dd2069da35c090010a7a18a39
+StStandardHbtEventReader.h:1499277863 - 642ab7526d18d2c7c8608d73744c7fc1
+gregsStHbtMuDstReader.h:1499277863 - 945fcc6fb89732982d8270a66c11f14e
+StHbtAsciiReader.h:1499277862 - 474b59af2897dd646c006cb906657ab7
+StHbtPythia6DstReader.h:1499277863 - 2841706e87af9be898fb92ca06784d91
+StHbtMuDstReader.h:1499277863 - 9d345748df4e72f023d5fd7e71745478
+flow_pDST.h:1499277863 - 378b4b7160da82f3ffd3cfbe1a551088
+StHbtBinaryReader.h:1499277863 - ba5776166eed54486e042c53ebbf0795
+StHbtMcEventReader.h:1499277863 - d93f371a02b5b2757ededc9dfae90df4
+StHbtTTreeReader.h:1499277863 - 6280e972c6a8ed046bd95890606a7ab2
+StHbtTagReader.h:1499277863 - 62bb6afecdeaf466fe45d09cea675b22
+AliStHbtTrack.h:1499277863 - 57b62d4dd2069da35c090010a7a18a39

+ 4 - 4
StRoot/StHbtMaker/Reader/StHbtPythia6DstReader.cxx

@@ -288,7 +288,7 @@ void StHbtPythia6DstReader::RandomGeneration(StHbtEvent *mHbtEvent) {
     track->SetFlag(100);
     track->SetCharge(pyLocalCharge);
     track->SetNHits(45);
-    //track->SetNHitsFit(45);
+    track->SetNHitsFit(45);
     track->SetNHitsPossible(45);
     track->SetNSigmaElectron(pyTrkNSigmaElectron);
     track->SetNSigmaPion(pyTrkNSigmaPion);
@@ -505,7 +505,7 @@ void StHbtPythia6DstReader::PrimaryTrackGeneration(StHbtEvent *mHbtEvent) {
       track->SetFlag(300);
       track->SetCharge(pyLocalCharge);
       track->SetNHits(45);
-      //track->SetNHitsFit(45);
+      track->SetNHitsFit(45);
       track->SetNHitsPossible(45);
       track->SetNSigmaElectron(pyTrkNSigmaElectron);
       track->SetNSigmaPion(pyTrkNSigmaPion);
@@ -781,7 +781,7 @@ void StHbtPythia6DstReader::V0Generation(StHbtEvent *mHbtEvent) {
 	mHbtV0->SetdcaPosToPrimVertex(pyTrkDCA2PrimVtx);
 	mHbtV0->SetmomPos( StHbtThreeVector(pyPosTrack.Px(), pyPosTrack.Py(), pyPosTrack.Pz()) );
 	mHbtV0->SettpcHitsPos(45);
-	//mHbtV0->SetnHitsFitPos(45);
+	mHbtV0->SetnHitsFitPos(45);
 	mHbtV0->SetnHitsPossiblePos(45);
 	mHbtV0->SetidPos(pyPosId);
 	mHbtV0->SetkeyPos(pyPosId);
@@ -832,7 +832,7 @@ void StHbtPythia6DstReader::V0Generation(StHbtEvent *mHbtEvent) {
 	mHbtV0->SetdcaNegToPrimVertex(pyTrkDCA2PrimVtx);
 	mHbtV0->SetmomNeg( StHbtThreeVector(pyNegTrack.Px(), pyNegTrack.Py(), pyNegTrack.Pz()) );
 	mHbtV0->SettpcHitsNeg(45);
-	//mHbtV0->SetnHitsFitNeg(45);
+	mHbtV0->SetnHitsFitNeg(45);
 	mHbtV0->SetnHitsPossibleNeg(45);
 	mHbtV0->SetidNeg(pyNegId);
 	mHbtV0->SetkeyNeg(pyNegId);

+ 23 - 22
StRoot/StHbtMaker/Reader/gregsStHbtMuDstReader.cxx

@@ -95,23 +95,23 @@ StHbtEvent* gregsStHbtMuDstReader::ReturnHbtEvent(){
 
     StMuEvent* mMuEvent = mMuDst->event();
     StBTofHeader *mTofHeader = mMuDst->btofHeader();
-    float mVpdVz;
+    Float_t mVpdVz;
 
-    //If trigger collection is not empty then check the trigger list
+
+    //If trigger collection is not empty then check trigger
     bool mTriggerIsPassed = IsGoodTrigger(mMuEvent);
     if(mTriggerIsPassed == false) {
       return 0;
     }
 
-    //Get number of primary vertices and tracks
+    //Get number of primary vertices
     Int_t mPrimVertNum = mMuDst->numberOfPrimaryVertices();
     Int_t mPrimTracksNum = mMuDst->numberOfPrimaryTracks();
     Int_t mGlobTracksNum = mMuDst->numberOfGlobalTracks();
 
-    //There should be some tracks and vertices in the event
+    //There should be some tracks in the event
     if(mPrimTracksNum<0 || mPrimTracksNum>10000 ||
-       mGlobTracksNum<0 || mGlobTracksNum>50000 ||
-       mPrimVertNum<0) {
+       mGlobTracksNum<0 || mGlobTracksNum>50000) {
       return 0;
     }
 
@@ -119,6 +119,7 @@ StHbtEvent* gregsStHbtMuDstReader::ReturnHbtEvent(){
     for(int iVert=0; iVert<mPrimVertNum; iVert++) {
 
       mHbtEvent = 0;
+      
       //std::cout << "iVert: " << iVert << std::endl;
 
       //Process only the first primary vertex if it is set
@@ -215,7 +216,7 @@ StHbtEvent* gregsStHbtMuDstReader::ReturnHbtEvent(){
       } //if(mReadV0s)
 
       // Apply event cut, if available
-      if(mEventCut) {
+      if (mEventCut) {
 
 	//std::cout << "Why am I here?" << std::endl;
 	if (!(mEventCut->Pass(mHbtEvent))){
@@ -227,7 +228,7 @@ StHbtEvent* gregsStHbtMuDstReader::ReturnHbtEvent(){
 
       return mHbtEvent;
     } //for(Int_t iVert=0; iVert<mPrimVertNum; iVert++)
-    
+
   } //if (mMuDst && mMuDst->event() )
   else {
     // DTSMaker returned NULL, so we are not OK
@@ -282,24 +283,21 @@ bool gregsStHbtMuDstReader::IsGoodPrimaryVertex(StMuPrimaryVertex *vertex,
 						Float_t vpdVz) {
 
   bool isGood = false;
-  float x = vertex->position().x();
-  float y = vertex->position().y();
-  float z = vertex->position().z();
-  float r = ::sqrt(x*x + y*y);
-  float vpdVzDiff = z - vpdVz;
-  if( (z >= -80.) && (z <= 80.) && (r <= 3.) &&
-      (vpdVzDiff >= -10.) && (vpdVzDiff <= 10.) &&
-      (vertex->ranking() > 0) ) {
+  Float_t x = vertex->position().x();
+  Float_t y = vertex->position().y();
+  Float_t z = vertex->position().z();
+  Float_t r = ::sqrt(x*x + y*y);
+  Float_t vpdVzDiff = z - vpdVz;
+  if( z >= -80. && z <= 80. &&
+      r <= 5. &&
+      vpdVzDiff >= -10. && vpdVzDiff <= 10. &&
+      vertex->ranking() > 0 ) {
     isGood = true;
   }
 
-  /*
-  if( (::abs(x)<1e-6) && 
-      (::abs(y)<1e-6) && 
-      (::abs(z)<1e-6) ) {
+  if(x==0 && y==0 && z==0) {
     isGood = false;
   }
-  */
 
   return isGood;
 }
@@ -313,10 +311,13 @@ bool gregsStHbtMuDstReader::IsGoodTrack(StMuTrack *trk, unsigned short vertInd)
       trk->momentum().mag() <= 1.7 &&
       trk->eta() >= -1.1 &&
       trk->eta() <= 1.1 &&
-      trk->nHits() >= 5 &&
+      trk->nHits() >= 14 &&
       trk->nHits() <= 50 &&
+      trk->nHitsFit() >= 14 &&
+      trk->nHitsFit() <= 50 &&
       trk->flag() >= 0 &&
       trk->flag() <= 1000 &&
+      ((Float_t)trk->nHitsFit()/(Float_t)trk->nHitsPoss()) >= 0.51 &&
       trk->dca(vertInd).perp() >= -0.0001 &&
       trk->dca(vertInd).perp() <= 3. &&
       trk->dcaGlobal(vertInd).perp() >= 0. &&

+ 2 - 3
StRoot/StHbtMaker/Reader/gregsStHbtMuDstReader.h

@@ -49,9 +49,8 @@ class gregsStHbtMuDstReader : public StHbtEventReader {
   
   //Standard methods
   int Init();
-  int Init(const char* ReadWrite, StHbtString& Message) { 
-    return StHbtEventReader::Init(ReadWrite,Message);
-  }//WarnOff
+  int Init(const char* ReadWrite, StHbtString& Message) 
+  { return StHbtEventReader::Init(ReadWrite,Message);}//WarnOff
   void Clear();
   void Finish();
 

+ 22 - 22
StRoot/StHbtMaker/ThCorrFctn/.consign

@@ -1,22 +1,22 @@
-StHbtThCFGaussFit.h:1432557445 - b2315a811e098b36f05218dbe4fe8b46
-StHbtFsiQuantStat.h:1432557449 - 228d39508395e17ce0849a75dfe5564e
-StHbtMomRes.hh:1432557440 - b3cf4f27664456743f80463583ac5d04
-StHbtEvtGenPair.h:1432557449 - 4ac16a01619fd44050343d56a9140e80
-ThQinvCorrFctn.h:1432557449 - 7315c033108196d04227cc68d97c0e7b
-StHbtThCFGaussSize.h:1432557452 - e9d135fe37ca21eeab1356ef2a0064e2
-StHbtThPairGaussFit.h:1432557447 - 4cd86176b5a036bfaa6348e4ffd3bc4f
-Th3DQCorrFctn.h:1432557444 - bd841825d202b882aa375aebdfab75a7
-ThNonId3DCF.h:1432557440 - 06ef310504d95a81b539222e58311ead
-ThBPCorrFctn.h:1432557441 - 301572d7eaebc29ce6702cd246947097
-StHbtThCorrFctnCollection.hh:1432557442 - 543a637630a5c820dc95d9a013bb5eda
-StHbtThPairDummy.h:1432557439 - ef197017130117e6da66a51c35d88f7b
-StHbtSmearedHiddenInfo.h:1432557444 - e3a9415e10720f3aabd6f87eb468347f
-StHbtThPairGauss.h:1432557452 - 21fb77b9e71688465ff1ecfeae48b43f
-StHbtFsiLednicky.h:1432557445 - 3d4aa8f6c2710a98fafbf8109844a613
-StHbtThCFManager.h:1432557451 - a6d28aa2967bf20b6608de6127a6e7fb
-StHbtFsiLednickyPurity.h:1432557450 - dafbcd4874562e9c9956a15142f6aef2
-StHbtShiftedHiddenInfo.h:1432557451 - 4f486d043b6aac1bd35f7cfc5ba108a7
-StHbtThPairDoubleGauss.h:1432557448 - 6c0d18eb5f6fbda8a3dee936b0abcf32
-StHbtEvtGenHiddenInfo.hh:1432557450 - 570900e5c54ebf151191b3b0f7e59f81
-StHbtThPairEvtGen.h:1432557439 - 542937313efb1b75ab028bc8b217d9bd
-StHbtThCFGaussSizeCollection.hh:1432557450 - 25b2070d2ab50971a25813ff4cd44965
+StHbtThCFGaussFit.h:1499277871 - b2315a811e098b36f05218dbe4fe8b46
+StHbtFsiQuantStat.h:1499277872 - fe1613b99724a766c653a9180224c87b
+StHbtMomRes.hh:1499277871 - b3cf4f27664456743f80463583ac5d04
+StHbtEvtGenPair.h:1499277871 - 4ac16a01619fd44050343d56a9140e80
+ThQinvCorrFctn.h:1499277871 - 7315c033108196d04227cc68d97c0e7b
+StHbtThCFGaussSize.h:1499277871 - e9d135fe37ca21eeab1356ef2a0064e2
+Th3DQCorrFctn.h:1499277871 - bd841825d202b882aa375aebdfab75a7
+StHbtThPairGaussFit.h:1499277871 - 4cd86176b5a036bfaa6348e4ffd3bc4f
+ThBPCorrFctn.h:1499277871 - 301572d7eaebc29ce6702cd246947097
+ThNonId3DCF.h:1499277872 - 06ef310504d95a81b539222e58311ead
+StHbtThCorrFctnCollection.hh:1499277871 - 543a637630a5c820dc95d9a013bb5eda
+StHbtThPairDummy.h:1499277872 - ef197017130117e6da66a51c35d88f7b
+StHbtSmearedHiddenInfo.h:1499277871 - e3a9415e10720f3aabd6f87eb468347f
+StHbtThPairGauss.h:1499277871 - 21fb77b9e71688465ff1ecfeae48b43f
+StHbtFsiLednicky.h:1499277871 - 3d4aa8f6c2710a98fafbf8109844a613
+StHbtThCFManager.h:1499277871 - a6d28aa2967bf20b6608de6127a6e7fb
+StHbtFsiLednickyPurity.h:1499277871 - dafbcd4874562e9c9956a15142f6aef2
+StHbtShiftedHiddenInfo.h:1499277872 - 4f486d043b6aac1bd35f7cfc5ba108a7
+StHbtThPairDoubleGauss.h:1499277871 - 6c0d18eb5f6fbda8a3dee936b0abcf32
+StHbtEvtGenHiddenInfo.hh:1499277871 - 570900e5c54ebf151191b3b0f7e59f81
+StHbtThPairEvtGen.h:1499277871 - 542937313efb1b75ab028bc8b217d9bd
+StHbtThCFGaussSizeCollection.hh:1499277871 - 25b2070d2ab50971a25813ff4cd44965

+ 0 - 363
StRoot/StHbtMaker/ThCorrFctn/FsiTools.F

@@ -1,363 +0,0 @@
-*
-* $Id: FsiTools.F,v 1.3 2003/03/18 14:41:49 kisiel Exp $
-*
-* $Log: FsiTools.F,v $
-* Revision 1.3  2003/03/18 14:41:49  kisiel
-* Bugfix update for the theoretical part of the code. Reverts the changes to the Lednicky weight calculator, as the previuos one had problems with strong interaction
-*
-* Revision 1.1.1.1  1996/04/01 15:01:55  mclareni
-* Mathlib gen
-*
-*
-      FUNCTION CGAMMA(Z)
-
-      DIMENSION C(0:15)
-      COMPLEX*8 Z,CGAMMA
-      COMPLEX*8 U,V,F,H,S
-      CHARACTER NAME*(*)
-      CHARACTER*80 ERRTXT
-      PARAMETER (NAME = 'CGAMMA')
-
-      PARAMETER (Z1 = 1, HF = Z1/2)
-
-      DATA PI /3.14159 26535 89793 24D0/
-      DATA C1 /2.50662 82746 31000 50D0/
-
-      DATA C( 0) / 41.62443 69164 39068D0/
-      DATA C( 1) /-51.22424 10223 74774D0/
-      DATA C( 2) / 11.33875 58134 88977D0/
-      DATA C( 3) / -0.74773 26877 72388D0/
-      DATA C( 4) /  0.00878 28774 93061D0/
-      DATA C( 5) / -0.00000 18990 30264D0/
-      DATA C( 6) /  0.00000 00019 46335D0/
-      DATA C( 7) / -0.00000 00001 99345D0/
-      DATA C( 8) /  0.00000 00000 08433D0/
-      DATA C( 9) /  0.00000 00000 01486D0/
-      DATA C(10) / -0.00000 00000 00806D0/
-      DATA C(11) /  0.00000 00000 00293D0/
-      DATA C(12) / -0.00000 00000 00102D0/
-      DATA C(13) /  0.00000 00000 00037D0/
-      DATA C(14) / -0.00000 00000 00014D0/
-      DATA C(15) /  0.00000 00000 00006D0/
-
-
-      U=Z
-      X=U
-      IF(AIMAG(U) .EQ. 0 .AND. -ABS(X) .EQ. INT(X)) THEN
-       F=0
-       H=0
-       WRITE(ERRTXT,101) X
-c       CALL MTLPRT(NAME,'C305.1',ERRTXT)
-      ELSE
-       IF(X .GE. 1) THEN
-        F=1
-        V=U
-       ELSEIF(X .GE. 0) THEN
-        F=1/U
-        V=1+U
-       ELSE
-        F=1
-        V=1-U
-       END IF
-       H=1
-       S=C(0)
-       DO 1 K = 1,15
-       H=((V-K)/(V+(K-1)))*H
-    1  S=S+C(K)*H
-       H=V+(4+HF)
-       H=C1*EXP((V-HF)*LOG(H)-H)*S
-       IF(X .LT. 0) H=PI/(SIN(PI*U)*H)
-      ENDIF
-      CGAMMA=F*H
-      RETURN
-  101 FORMAT('ARGUMENT EQUALS NON-POSITIVE INTEGER = ',1P,E15.1)
-      END
-
-*
-* $Id: FsiTools.F,v 1.3 2003/03/18 14:41:49 kisiel Exp $
-*
-* $Log: FsiTools.F,v $
-* Revision 1.3  2003/03/18 14:41:49  kisiel
-* Bugfix update for the theoretical part of the code. Reverts the changes to the Lednicky weight calculator, as the previuos one had problems with strong interaction
-*
-* Revision 1.1.1.1  1996/04/01 15:02:02  mclareni
-* Mathlib gen
-*
-*
-      FUNCTION DFRSIN(X)
-
-      IMPLICIT REAL*8 (A-H,O-Z)
-      DIMENSION A(0:16),B(0:15),C1(0:25),C2(0:28)
-
-      PARAMETER (Z1 = 1, R8 = Z1/8, R32 = Z1/32)
-
-      DATA C0 /1.25331 41373 15500 3D0/
-
-      DATA NA,NB,NC1,NC2 /16,15,25,28/
-
-      DATA A( 0) / 0.76435 13866 41860 002D0/
-      DATA A( 1) /-0.43135 54754 76601 793D0/
-      DATA A( 2) / 0.43288 19997 97266 531D0/
-      DATA A( 3) /-0.26973 31033 83871 110D0/
-      DATA A( 4) / 0.08416 04532 08769 354D0/
-      DATA A( 5) /-0.01546 52448 44613 820D0/
-      DATA A( 6) / 0.00187 85542 34398 220D0/
-      DATA A( 7) /-0.00016 26497 76188 875D0/
-      DATA A( 8) / 0.00001 05739 76563 833D0/
-      DATA A( 9) /-0.00000 05360 93398 892D0/
-      DATA A(10) / 0.00000 00218 16584 549D0/
-      DATA A(11) /-0.00000 00007 29016 212D0/
-      DATA A(12) / 0.00000 00000 20373 325D0/
-      DATA A(13) /-0.00000 00000 00483 440D0/
-      DATA A(14) / 0.00000 00000 00009 865D0/
-      DATA A(15) /-0.00000 00000 00000 175D0/
-      DATA A(16) / 0.00000 00000 00000 003D0/
-
-      DATA B( 0) / 0.63041 40431 45705 392D0/
-      DATA B( 1) /-0.42344 51140 57053 335D0/
-      DATA B( 2) / 0.37617 17264 33436 566D0/
-      DATA B( 3) /-0.16249 48915 45095 674D0/
-      DATA B( 4) / 0.03822 25577 86330 087D0/
-      DATA B( 5) /-0.00564 56347 71321 909D0/
-      DATA B( 6) / 0.00057 45495 19768 974D0/
-      DATA B( 7) /-0.00004 28707 15321 020D0/
-      DATA B( 8) / 0.00000 24512 07499 233D0/
-      DATA B( 9) /-0.00000 01109 88418 409D0/
-      DATA B(10) / 0.00000 00040 82497 317D0/
-      DATA B(11) /-0.00000 00001 24498 302D0/
-      DATA B(12) / 0.00000 00000 03200 484D0/
-      DATA B(13) /-0.00000 00000 00070 324D0/
-      DATA B(14) / 0.00000 00000 00001 336D0/
-      DATA B(15) /-0.00000 00000 00000 022D0/
-
-      DATA C1( 0) / 0.99056 04793 73497 549D0/
-      DATA C1( 1) /-0.01218 35098 31478 997D0/
-      DATA C1( 2) /-0.00248 27428 23113 060D0/
-      DATA C1( 3) / 0.00026 60949 52647 247D0/
-      DATA C1( 4) /-0.00000 10790 68987 406D0/
-      DATA C1( 5) /-0.00000 48836 81753 933D0/
-      DATA C1( 6) / 0.00000 09990 55266 368D0/
-      DATA C1( 7) /-0.00000 00750 92717 372D0/
-      DATA C1( 8) /-0.00000 00190 79487 573D0/
-      DATA C1( 9) / 0.00000 00090 90797 293D0/
-      DATA C1(10) /-0.00000 00019 66236 033D0/
-      DATA C1(11) / 0.00000 00001 64772 911D0/
-      DATA C1(12) / 0.00000 00000 63079 714D0/
-      DATA C1(13) /-0.00000 00000 36432 219D0/
-      DATA C1(14) / 0.00000 00000 10536 930D0/
-      DATA C1(15) /-0.00000 00000 01716 438D0/
-      DATA C1(16) /-0.00000 00000 00107 124D0/
-      DATA C1(17) / 0.00000 00000 00204 099D0/
-      DATA C1(18) /-0.00000 00000 00090 064D0/
-      DATA C1(19) / 0.00000 00000 00025 506D0/
-      DATA C1(20) /-0.00000 00000 00004 036D0/
-      DATA C1(21) /-0.00000 00000 00000 570D0/
-      DATA C1(22) / 0.00000 00000 00000 762D0/
-      DATA C1(23) /-0.00000 00000 00000 363D0/
-      DATA C1(24) / 0.00000 00000 00000 118D0/
-      DATA C1(25) /-0.00000 00000 00000 025D0/
-
-      DATA C2( 0) / 0.04655 77987 37516 4561D0/
-      DATA C2( 1) / 0.04499 21302 01239 4140D0/
-      DATA C2( 2) /-0.00175 42871 39651 4532D0/
-      DATA C2( 3) /-0.00014 65340 02581 0678D0/
-      DATA C2( 4) / 0.00003 91330 40863 0159D0/
-      DATA C2( 5) /-0.00000 34932 28659 7731D0/
-      DATA C2( 6) /-0.00000 03153 53003 2345D0/
-      DATA C2( 7) / 0.00000 01876 58200 8529D0/
-      DATA C2( 8) /-0.00000 00377 55280 4930D0/
-      DATA C2( 9) / 0.00000 00026 65516 5010D0/
-      DATA C2(10) / 0.00000 00010 88144 8122D0/
-      DATA C2(11) /-0.00000 00005 35500 7671D0/
-      DATA C2(12) / 0.00000 00001 31576 5447D0/
-      DATA C2(13) /-0.00000 00000 15286 0881D0/
-      DATA C2(14) /-0.00000 00000 03394 7646D0/
-      DATA C2(15) / 0.00000 00000 02702 0267D0/
-      DATA C2(16) /-0.00000 00000 00946 3142D0/
-      DATA C2(17) / 0.00000 00000 00207 1565D0/
-      DATA C2(18) /-0.00000 00000 00012 6931D0/
-      DATA C2(19) /-0.00000 00000 00013 9756D0/
-      DATA C2(20) / 0.00000 00000 00008 5929D0/
-      DATA C2(21) /-0.00000 00000 00003 1070D0/
-      DATA C2(22) / 0.00000 00000 00000 7515D0/
-      DATA C2(23) /-0.00000 00000 00000 0648D0/
-      DATA C2(24) /-0.00000 00000 00000 0522D0/
-      DATA C2(25) / 0.00000 00000 00000 0386D0/
-      DATA C2(26) /-0.00000 00000 00000 0165D0/
-      DATA C2(27) / 0.00000 00000 00000 0050D0/
-      DATA C2(28) /-0.00000 00000 00000 0009D0/
-
-      V=ABS(X)
-      IF(V .LT. 8) THEN
-       Y=R8*V
-       H=2*Y**2-1
-       ALFA=H+H
-       B1=0
-       B2=0
-       DO 4 I = NB,0,-1
-       B0=B(I)+ALFA*B1-B2
-       B2=B1
-    4  B1=B0
-       H=SQRT(V)*Y*(B0-B2)
-      ELSE
-       R=1/V
-       H=10*R-1
-       ALFA=H+H
-       B1=0
-       B2=0
-       DO 5 I = NC1,0,-1
-       B0=C1(I)+ALFA*B1-B2
-       B2=B1
-    5  B1=B0
-       S=B0-H*B2
-       B1=0
-       B2=0
-       DO 6 I = NC2,0,-1
-       B0=C2(I)+ALFA*B1-B2
-       B2=B1
-    6  B1=B0
-       H=C0-SQRT(R)*(S*COS(V)+(B0-H*B2)*SIN(V))
-      END IF
-      IF(X .LT. 0) H=-H
-      DFRSIN=H
-      return
-      end
-
-
-      function DFRCOS(X)
-
-      IMPLICIT REAL*8 (A-H,O-Z)
-      DIMENSION A(0:16),B(0:15),C1(0:25),C2(0:28)
-
-      PARAMETER (Z1 = 1, R8 = Z1/8, R32 = Z1/32)
-
-      DATA C0 /1.25331 41373 15500 3D0/
-
-      DATA NA,NB,NC1,NC2 /16,15,25,28/
-
-      DATA A( 0) / 0.76435 13866 41860 002D0/
-      DATA A( 1) /-0.43135 54754 76601 793D0/
-      DATA A( 2) / 0.43288 19997 97266 531D0/
-      DATA A( 3) /-0.26973 31033 83871 110D0/
-      DATA A( 4) / 0.08416 04532 08769 354D0/
-      DATA A( 5) /-0.01546 52448 44613 820D0/
-      DATA A( 6) / 0.00187 85542 34398 220D0/
-      DATA A( 7) /-0.00016 26497 76188 875D0/
-      DATA A( 8) / 0.00001 05739 76563 833D0/
-      DATA A( 9) /-0.00000 05360 93398 892D0/
-      DATA A(10) / 0.00000 00218 16584 549D0/
-      DATA A(11) /-0.00000 00007 29016 212D0/
-      DATA A(12) / 0.00000 00000 20373 325D0/
-      DATA A(13) /-0.00000 00000 00483 440D0/
-      DATA A(14) / 0.00000 00000 00009 865D0/
-      DATA A(15) /-0.00000 00000 00000 175D0/
-      DATA A(16) / 0.00000 00000 00000 003D0/
-
-      DATA B( 0) / 0.63041 40431 45705 392D0/
-      DATA B( 1) /-0.42344 51140 57053 335D0/
-      DATA B( 2) / 0.37617 17264 33436 566D0/
-      DATA B( 3) /-0.16249 48915 45095 674D0/
-      DATA B( 4) / 0.03822 25577 86330 087D0/
-      DATA B( 5) /-0.00564 56347 71321 909D0/
-      DATA B( 6) / 0.00057 45495 19768 974D0/
-      DATA B( 7) /-0.00004 28707 15321 020D0/
-      DATA B( 8) / 0.00000 24512 07499 233D0/
-      DATA B( 9) /-0.00000 01109 88418 409D0/
-      DATA B(10) / 0.00000 00040 82497 317D0/
-      DATA B(11) /-0.00000 00001 24498 302D0/
-      DATA B(12) / 0.00000 00000 03200 484D0/
-      DATA B(13) /-0.00000 00000 00070 324D0/
-      DATA B(14) / 0.00000 00000 00001 336D0/
-      DATA B(15) /-0.00000 00000 00000 022D0/
-
-      DATA C1( 0) / 0.99056 04793 73497 549D0/
-      DATA C1( 1) /-0.01218 35098 31478 997D0/
-      DATA C1( 2) /-0.00248 27428 23113 060D0/
-      DATA C1( 3) / 0.00026 60949 52647 247D0/
-      DATA C1( 4) /-0.00000 10790 68987 406D0/
-      DATA C1( 5) /-0.00000 48836 81753 933D0/
-      DATA C1( 6) / 0.00000 09990 55266 368D0/
-      DATA C1( 7) /-0.00000 00750 92717 372D0/
-      DATA C1( 8) /-0.00000 00190 79487 573D0/
-      DATA C1( 9) / 0.00000 00090 90797 293D0/
-      DATA C1(10) /-0.00000 00019 66236 033D0/
-      DATA C1(11) / 0.00000 00001 64772 911D0/
-      DATA C1(12) / 0.00000 00000 63079 714D0/
-      DATA C1(13) /-0.00000 00000 36432 219D0/
-      DATA C1(14) / 0.00000 00000 10536 930D0/
-      DATA C1(15) /-0.00000 00000 01716 438D0/
-      DATA C1(16) /-0.00000 00000 00107 124D0/
-      DATA C1(17) / 0.00000 00000 00204 099D0/
-      DATA C1(18) /-0.00000 00000 00090 064D0/
-      DATA C1(19) / 0.00000 00000 00025 506D0/
-      DATA C1(20) /-0.00000 00000 00004 036D0/
-      DATA C1(21) /-0.00000 00000 00000 570D0/
-      DATA C1(22) / 0.00000 00000 00000 762D0/
-      DATA C1(23) /-0.00000 00000 00000 363D0/
-      DATA C1(24) / 0.00000 00000 00000 118D0/
-      DATA C1(25) /-0.00000 00000 00000 025D0/
-
-      DATA C2( 0) / 0.04655 77987 37516 4561D0/
-      DATA C2( 1) / 0.04499 21302 01239 4140D0/
-      DATA C2( 2) /-0.00175 42871 39651 4532D0/
-      DATA C2( 3) /-0.00014 65340 02581 0678D0/
-      DATA C2( 4) / 0.00003 91330 40863 0159D0/
-      DATA C2( 5) /-0.00000 34932 28659 7731D0/
-      DATA C2( 6) /-0.00000 03153 53003 2345D0/
-      DATA C2( 7) / 0.00000 01876 58200 8529D0/
-      DATA C2( 8) /-0.00000 00377 55280 4930D0/
-      DATA C2( 9) / 0.00000 00026 65516 5010D0/
-      DATA C2(10) / 0.00000 00010 88144 8122D0/
-      DATA C2(11) /-0.00000 00005 35500 7671D0/
-      DATA C2(12) / 0.00000 00001 31576 5447D0/
-      DATA C2(13) /-0.00000 00000 15286 0881D0/
-      DATA C2(14) /-0.00000 00000 03394 7646D0/
-      DATA C2(15) / 0.00000 00000 02702 0267D0/
-      DATA C2(16) /-0.00000 00000 00946 3142D0/
-      DATA C2(17) / 0.00000 00000 00207 1565D0/
-      DATA C2(18) /-0.00000 00000 00012 6931D0/
-      DATA C2(19) /-0.00000 00000 00013 9756D0/
-      DATA C2(20) / 0.00000 00000 00008 5929D0/
-      DATA C2(21) /-0.00000 00000 00003 1070D0/
-      DATA C2(22) / 0.00000 00000 00000 7515D0/
-      DATA C2(23) /-0.00000 00000 00000 0648D0/
-      DATA C2(24) /-0.00000 00000 00000 0522D0/
-      DATA C2(25) / 0.00000 00000 00000 0386D0/
-      DATA C2(26) /-0.00000 00000 00000 0165D0/
-      DATA C2(27) / 0.00000 00000 00000 0050D0/
-      DATA C2(28) /-0.00000 00000 00000 0009D0/
-
-      V=ABS(X)
-      IF(V .LT. 8) THEN
-       H=R32*V**2-1
-       ALFA=H+H
-       B1=0
-       B2=0
-       DO 1 I = NA,0,-1
-       B0=A(I)+ALFA*B1-B2
-       B2=B1
-    1  B1=B0
-       H=SQRT(V)*(B0-H*B2)
-      ELSE
-       R=1/V
-       H=10*R-1
-       ALFA=H+H
-       B1=0
-       B2=0
-       DO 2 I = NC1,0,-1
-       B0=C1(I)+ALFA*B1-B2
-       B2=B1
-    2  B1=B0
-       S=B0-H*B2
-       B1=0
-       B2=0
-       DO 3 I = NC2,0,-1
-       B0=C2(I)+ALFA*B1-B2
-       B2=B1
-    3  B1=B0
-       H=C0-SQRT(R)*((B0-H*B2)*COS(V)-S*SIN(V))
-      END IF
-      IF(X .LT. 0) H=-H
-      DFRCOS=H
-      RETURN
-      END

File diff suppressed because it is too large
+ 0 - 1540
StRoot/StHbtMaker/ThCorrFctn/FsiWeightLednicky2.F


+ 1 - 0
StRoot/StHbtMaker/ThLednickyWeight/.consign

@@ -0,0 +1 @@
+WLedCOMMONS.h:1499277872 - 98be76a831484896fb1e4adb47bb30fd

+ 1 - 1
StRoot/StHbtMaker/doc/Make/.consign

@@ -1 +1 @@
-math_constants.h:1432557318 - 492f9ce38e97799860a16121d87c92d4
+math_constants.h:1499277859 - 492f9ce38e97799860a16121d87c92d4

+ 0 - 3
StRoot/StHbtMaker_alpha/.consign

@@ -1,3 +0,0 @@
-StRandyTopMapMaker.h:1453275723 - ddcf90ddf2644fa118a0e3aed113c20a
-StHbtTagMaker.h:1432557452 - f3a0c4e407a231804e28ea5a3a0f7eb2
-StHbtMaker.h:1453275672 - c2dfc18bac48fa4cb544bd90ea1bb506

+ 0 - 21
StRoot/StHbtMaker_alpha/Base/.consign

@@ -1,21 +0,0 @@
-StHbtXiCut.h:1432557432 - 84c321d865b0b92838de17cce73c8ede
-StHbtLikeSignCorrFctn.hh:1432557432 - 7020177bb74736ce989b2079448f1959
-StHbtBaseAnalysis.h:1432557437 - 971a7fe1db40d727c0b2d92baa3e1b8a
-StHbtEventCut.h:1432557430 - 5c449391085133c3b52b793a173fe065
-StHbtThCorrFctn.hh:1432557431 - 3dcc81078769c5f14e55808099ad4aa3
-StHbtPairCut.h:1432557433 - 05c875e9c050a86cc43ec222be060c1b
-StHbtEventReader.hh:1432557438 - d3b28bedfcf77b7eb4632585ba505188
-StHbtRoot1DCF.hh:1432557430 - 7f360f3c3ed4e6d4d85cc8ce5ae1dd1b
-StHbtRoot2DCF.hh:1432557431 - 5b35bd5ea893e9e5b2c2d57d90814c62
-StHbtFsiWeight.hh:1432557438 - 390d678b84bd480cdbf896b6a31129c1
-StHbtV0Cut.h:1432557435 - 2fae89bd3d48afdcc1b7bbbb0710453d
-StHbtHiddenInfo.hh:1432557430 - efccf3bb267bf430a768ca2d3f98a6a2
-StHbtParticleCut.h:1432557436 - 55fe540881d1cb53f08f83258235cfc2
-StHbtTripletCut.h:1432557435 - ad599e52265c79233ef4371ae4e18ab1
-StHbtThPair.hh:1432557434 - 3d0102c2fb19d55f100a0f9c75b242ef
-StHbtCorrFctn.hh:1432557437 - 1c041139bb22d949bf2f7b11e4ff86a1
-StHbtRoot3DCF.hh:1432557436 - 6971a5d8139fae54db30bfa02017dd41
-StHbtCutMonitor.hh:1432557432 - f01ee69b90d2edaa4b7fc7566be4e7e5
-StHbtEventWriter.hh:1432557431 - 0ddc601c196b4929021b07bb15d4743d
-StHbtTrackCut.h:1432557435 - caea760e22e033389628a40ec01d7feb
-StHbtKinkCut.h:1432557433 - 9a0a7c862cb6155a0366b8d63bfbf0b6

+ 0 - 28
StRoot/StHbtMaker_alpha/Base/CVS/Entries

@@ -1,28 +0,0 @@
-/StHbtBaseAnalysis.h/1.5/Thu Jun 15 18:51:32 2000//
-/StHbtCorrFctn.hh/1.11/Fri Jan 18 16:13:04 2013//
-/StHbtCutMonitor.hh/1.7/Tue Nov 19 23:13:21 2002//
-/StHbtEventCut.h/1.9/Thu Jun 21 19:06:48 2001//
-/StHbtEventReader.cc/1.2/Wed Sep  5 20:41:00 2001//
-/StHbtEventReader.hh/1.13/Tue Sep  2 17:58:20 2003//
-/StHbtEventWriter.hh/1.1/Fri Feb 18 21:25:00 2000//
-/StHbtFsiWeight.cc/1.1/Tue Apr  3 21:01:07 2001//
-/StHbtFsiWeight.hh/1.1/Tue Apr  3 21:01:07 2001//
-/StHbtHiddenInfo.hh/1.2/Fri Dec 14 23:11:22 2001//
-/StHbtKinkCut.h/1.1/Fri May 25 23:23:58 2001//
-/StHbtLikeSignCorrFctn.hh/1.2/Thu Jun 21 19:06:49 2001//
-/StHbtPairCut.h/1.10/Thu Jun 21 19:06:49 2001//
-/StHbtParticleCut.h/1.9/Tue Aug 25 20:17:51 2009//
-/StHbtRoot1DCF.cc/1.2/Tue Sep  2 17:58:20 2003//
-/StHbtRoot1DCF.hh/1.1/Tue Apr  3 21:01:08 2001//
-/StHbtRoot2DCF.cc/1.2/Tue Sep  2 17:58:20 2003//
-/StHbtRoot2DCF.hh/1.1/Tue Apr  3 21:01:08 2001//
-/StHbtRoot3DCF.cc/1.2/Tue Sep  2 17:58:20 2003//
-/StHbtRoot3DCF.hh/1.1/Tue Apr  3 21:01:08 2001//
-/StHbtThCorrFctn.hh/1.2/Sun Feb  2 22:55:49 2003//
-/StHbtThPair.cc/1.4/Tue Sep  2 17:58:20 2003//
-/StHbtThPair.hh/1.2/Thu Dec 12 17:04:49 2002//
-/StHbtTrackCut.h/1.4/Thu Mar 23 22:43:28 2000//
-/StHbtTripletCut.h/1.5/Tue Aug 25 20:17:51 2009//
-/StHbtV0Cut.h/1.4/Thu Mar 23 22:43:28 2000//
-/StHbtXiCut.h/1.1/Wed Sep  5 20:41:00 2001//
-D

+ 0 - 1
StRoot/StHbtMaker_alpha/Base/CVS/Repository

@@ -1 +0,0 @@
-StRoot/StHbtMaker/Base

+ 0 - 1
StRoot/StHbtMaker_alpha/Base/CVS/Root

@@ -1 +0,0 @@
-/afs/rhic.bnl.gov/star/packages/repository

+ 0 - 56
StRoot/StHbtMaker_alpha/Base/StHbtBaseAnalysis.h

@@ -1,56 +0,0 @@
-/***************************************************************************
- *
- * $Id: StHbtBaseAnalysis.h,v 1.5 2000/06/15 18:51:32 willson Exp $
- *
- * Author: Robert Willson, Ohio State, willson@bnl.gov
- ***************************************************************************
- * 
- * Description: part of STAR HBT Framework: StHbtMaker package
- *   base class for an HBT analysis.  Users should use one of the
- *   inherited analysis classes with this class.
- *
- ***************************************************************************
- *
- * $Log: StHbtBaseAnalysis.h,v $
- * Revision 1.5  2000/06/15 18:51:32  willson
- * Cuts and Correlation function information moved from StBaseAnalysis
- * to the derived analysis classes.  Global functions installed in
- * Cut and CorrFctn base classes to access analysis pointer.
- *
- * Revision 1.4  2000/05/11 21:16:40  willson
- * myAnalysis pointer changed to type StHbtBaseAnalysis - moved
- * some methods into StHbtBaseAnalysis class
- *
- * Revision 1.3  2000/04/12 01:53:00  willson
- * Initial Installation - Comments Added
- *
- *
- ***************************************************************************/
-
-#ifndef StHbtBaseAnalysis_hh
-#define StHbtBaseAnalysis_hh
-
-#include "StHbtMaker/Infrastructure/StHbtTypes.hh"
-
-class StHbtEvent;
-
-class StHbtBaseAnalysis{
-
-public:
-
-  StHbtBaseAnalysis() { /* noop */ };
-  virtual ~StHbtBaseAnalysis() { /* noop */ };
-
-#ifdef __ROOT__
-  ClassDef(StHbtBaseAnalysis, 0)
-#endif 
-  
-  virtual StHbtString Report() = 0;       //! returns reports of all cuts applied and correlation functions being done
-
-  virtual void ProcessEvent(const StHbtEvent*) = 0;
-
-  virtual void Finish() = 0;
-
-};
-
-#endif

+ 0 - 113
StRoot/StHbtMaker_alpha/Base/StHbtCorrFctn.hh

@@ -1,113 +0,0 @@
-/***************************************************************************
- *
- * $Id: StHbtCorrFctn.hh,v 1.11 2013/01/18 16:13:04 yyang Exp $
- *
- * Author: Mike Lisa, Ohio State, lisa@mps.ohio-state.edu
- ***************************************************************************
- *
- * Description: part of STAR HBT Framework: StHbtMaker package
- *    base class for a STAR correlation function.  Users should inherit 
- *    from this and must implement constructor, destructor, Report(),
- *    AddMixedPair(), AddRealPair(), Finish()
- *
- ***************************************************************************
- *
- * $Log: StHbtCorrFctn.hh,v $
- * Revision 1.11  2013/01/18 16:13:04  yyang
- * Add PairCut for CFs that share same cuts, but pair cuts
- *
- * Revision 1.10  2001/06/21 19:06:48  laue
- * Some minor structural changes (forward declarations, etc)
- *
- * Revision 1.9  2000/06/29 23:01:10  finch
- * added an extra base class for Parity Computations
- *
- * Revision 1.8  2000/06/15 18:51:32  willson
- * Cuts and Correlation function information moved from StBaseAnalysis
- * to the derived analysis classes.  Global functions installed in
- * Cut and CorrFctn base classes to access analysis pointer.
- *
- * Revision 1.7  2000/05/11 21:16:40  willson
- * myAnalysis pointer changed to type StHbtBaseAnalysis - moved
- * some methods into StHbtBaseAnalysis class
- *
- * Revision 1.6  2000/03/23 22:43:27  laue
- * Clone() function implemented in cuts.
- *
- * Revision 1.5  2000/03/16 01:54:36  laue
- * Copy constructor added to all the cut base classes and to the
- * corrfctn base class
- *
- * Revision 1.4  2000/02/13 17:13:09  laue
- * EventBegin() and EventEnd() functions implemented
- *
- * Revision 1.3  1999/12/03 22:24:33  lisa
- * (1) make Cuts and CorrFctns point back to parent Analysis (as well as other way). (2) Accommodate new PidTraits mechanism
- *
- * Revision 1.2  1999/07/06 22:33:18  lisa
- * Adjusted all to work in pro and new - dev itself is broken
- *
- * Revision 1.1.1.1  1999/06/29 16:02:56  lisa
- * Installation of StHbtMaker
- *
- **************************************************************************/
-
-#ifndef StHbtCorrFctn_hh
-#define StHbtCorrFctn_hh
-
-#include "StHbtMaker/Base/StHbtBaseAnalysis.h"
-#include "StHbtMaker/Base/StHbtPairCut.h"
-#include "StHbtMaker/Infrastructure/StParityTypes.hh"  // can not forward declare typedefs
-#include "StHbtMaker/Infrastructure/StHbtEvent.hh"
-#include "StHbtMaker/Infrastructure/StHbtPair.hh"
-#include "StHbtMaker/Infrastructure/StHbtTriplet.hh"
-#include "StHbtMaker/Infrastructure/StHbtHisto.hh"
-
-class StHbtCorrFctn{
-
-public:
-  StHbtCorrFctn() { mPairCut = 0; }
-  StHbtCorrFctn(const StHbtCorrFctn& );
-  virtual ~StHbtCorrFctn(){/* no-op */}
-
-  virtual StHbtString Report() = 0;
-
-  virtual void ParityCompute(ParityBuff*, ParityBuff*, int);
-
-  virtual void AddRealPair(const StHbtPair*);
-  virtual void AddMixedPair(const StHbtPair*);
-
-  virtual void AddRealTriplet(const StHbtTriplet*);
-  virtual void AddMixedTriplet(const StHbtTriplet*);
-
-  virtual void EventBegin(const StHbtEvent*) { /* no-op */ }
-  virtual void EventEnd(const StHbtEvent*) { /* no-op */ }
-  virtual void Finish() = 0;
-
-  virtual StHbtCorrFctn* Clone() { return 0;}
-
-  virtual StHbtPairCut* GetPairCut() { return mPairCut; }
-
-  // the following allows "back-pointing" from the CorrFctn to the "parent" Analysis
-  friend class StHbtBaseAnalysis;
-  StHbtBaseAnalysis* HbtAnalysis(){return myAnalysis;};
-  void SetAnalysis(StHbtBaseAnalysis*);
-
-protected:
-  StHbtBaseAnalysis* myAnalysis;
-  StHbtPairCut* mPairCut;
-
-private:
-
-};
-
-inline void StHbtCorrFctn::ParityCompute(ParityBuff*, ParityBuff*, int) { cout << "Not implemented" << endl; }
-inline void StHbtCorrFctn::AddRealPair(const StHbtPair*) { cout << "Not implemented" << endl; }
-inline void StHbtCorrFctn::AddMixedPair(const StHbtPair*) { cout << "Not implemented" << endl; }
-inline void StHbtCorrFctn::AddRealTriplet(const StHbtTriplet*) { cout << "Not implemented" << endl; }
-inline void StHbtCorrFctn::AddMixedTriplet(const StHbtTriplet*) { cout << "Not implemented" << endl; }
-
-inline StHbtCorrFctn::StHbtCorrFctn(const StHbtCorrFctn& c) { myAnalysis =0; mPairCut = c.mPairCut; }
-inline void StHbtCorrFctn::SetAnalysis(StHbtBaseAnalysis* analysis) { myAnalysis = analysis; }
-
-#endif

+ 0 - 77
StRoot/StHbtMaker_alpha/Base/StHbtCutMonitor.hh

@@ -1,77 +0,0 @@
-#ifndef StHbtCutMonitor_hh
-#define StHbtCutMonitor_hh
-
-class StHbtEvent;
-class StHbtTrack;
-class StHbtV0;
-class StHbtKink;
-class StHbtPair; // Gael 12/04/02
-#include "StHbtMaker/Infrastructure/StHbtString.hh"
-#include "StHbtMaker/Infrastructure/StHbtParticleCollection.hh" // Gael 19/06/02
-
-class StHbtCutMonitor{
-  
-private:
-  
-public:
-  StHbtCutMonitor(){/* no-op */};
-  virtual ~StHbtCutMonitor(){/* no-op */};
-  virtual StHbtString Report(){ 
-    string Stemp = "*** no user defined Fill(const StHbtEvent*), take from base class"; 
-    StHbtString returnThis = Stemp;
-    return returnThis; 
-  }
-  virtual void EventBegin(const StHbtEvent*) { /* no-op */ }
-  virtual void EventEnd(const StHbtEvent*) { /* no-op */ }
-  virtual void Fill(const StHbtEvent*) { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const StHbtEvent*), take from base class" << endl;
-#endif
-  }
-  virtual void Fill(const StHbtTrack*) { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const StHbtTrack*), take from base class" << endl;
-#endif
-  }
-  virtual void Fill(const StHbtV0*) { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const StHbtV0Track*), take from base class" << endl;
-#endif
-  }
-  virtual void Fill(const StHbtKink*) { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const StHbtKink*), take from base class" << endl;
-#endif
-  }
-  //-----------------------------------Gael 12/04/02------------------------------------
-  virtual void Fill(const StHbtPair*) { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const StHbtPair*), take from base class" << endl;
-#endif
-  }
-  //-----------------------------------Gael 19/06/02------------------------------------
-  virtual void Fill(const StHbtParticleCollection*) {
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const StHbtParticleCollection*), take from base class" << endl;
-#endif
-  }
-  //-----------------------------------Gael 19/06/02------------------------------------
-  virtual void Fill(const StHbtEvent*,const StHbtParticleCollection*) {
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Fill(const StHbtEvent*,const StHbtParticleCollection*), take from base class" << endl;
-#endif
-  }
-  // -------------------------------------------------------------------------------------
-  virtual void Finish() { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Finish(), take from base class" << endl;
-#endif
-  }
-  virtual void Init() { 
-#ifdef STHBTDEBUG
-    cout << " *** no user defined Init(), take from base class" << endl;
-#endif
-  }
-};
-
-#endif

+ 0 - 105
StRoot/StHbtMaker_alpha/Base/StHbtEventCut.h

@@ -1,105 +0,0 @@
-/***************************************************************************
- *
- * $Id: StHbtEventCut.h,v 1.9 2001/06/21 19:06:48 laue Exp $
- *
- * Author: Mike Lisa, Ohio State, lisa@mps.ohio-state.edu
- ***************************************************************************
- *
- * Description: part of STAR HBT Framework: StHbtMaker package
- *       base class for Eventwise cuts
- *      Users inherit from this class and must add their own quantities        
- *
- ***************************************************************************
- *
- * $Log: StHbtEventCut.h,v $
- * Revision 1.9  2001/06/21 19:06:48  laue
- * Some minor structural changes (forward declarations, etc)
- *
- * Revision 1.8  2000/06/15 18:51:32  willson
- * Cuts and Correlation function information moved from StBaseAnalysis
- * to the derived analysis classes.  Global functions installed in
- * Cut and CorrFctn base classes to access analysis pointer.
- *