Merge pull request #28 from jthaeder/master

fix american "analyze"
rnc-lbl · Apr 14, 2015 · 5010c9e · 5010c9e
2 parents 9aaf664 + 38f5b7f
commit 5010c9e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/StRoot/StPicoHFMaker/StPicoHFMaker.cxx b/StRoot/StPicoHFMaker/StPicoHFMaker.cxx
@@ -25,7 +25,7 @@ ClassImp(StPicoHFMaker)
 StPicoHFMaker::StPicoHFMaker(char const* name, StPicoDstMaker* picoMaker, 
 				       char const* outputBaseFileName,  char const* inputHFListHFtree = "") :
   StMaker(name), mPicoDst(NULL), mHFCuts(NULL), mPicoHFEvent(NULL), mBField(0.), mOutList(NULL),
-  mDecayMode(StPicoHFEvent::kTwoParticleDecay), mMakerMode(StPicoHFMaker::kAnalyse), 
+  mDecayMode(StPicoHFEvent::kTwoParticleDecay), mMakerMode(StPicoHFMaker::kAnalyze), 
   mOuputFileBaseName(outputBaseFileName), mInputFileName(inputHFListHFtree),
   mPicoDstMaker(picoMaker), mPicoEvent(NULL), mTree(NULL), mHFChain(NULL), mEventCounter(0), 
   mOutputFileTree(NULL), mOutputFileList(NULL) {
@@ -205,7 +205,7 @@ Int_t StPicoHFMaker::Make() {
     UInt_t nTracks = mPicoDst->numberOfTracks();
 
     // -- Fill vectors of particle types
-    if (mMakerMode == StPicoHFMaker::kWrite || mMakerMode == StPicoHFMaker::kAnalyse) {
+    if (mMakerMode == StPicoHFMaker::kWrite || mMakerMode == StPicoHFMaker::kAnalyze) {
       for (unsigned short iTrack = 0; iTrack < nTracks; ++iTrack) {
 	StPicoTrack* trk = mPicoDst->track(iTrack);
 
@@ -217,7 +217,7 @@ Int_t StPicoHFMaker::Make() {
 	if (isProton(trk, beta)) mIdxPicoProtons.push_back(iTrack); // isProton method to be implemented by daughter class
 
       } // .. end tracks loop
-    } // if (mMakerMode == StPicoHFMaker::kWrite || mMakerMode == StPicoHFMaker::kAnalyse) {
+    } // if (mMakerMode == StPicoHFMaker::kWrite || mMakerMode == StPicoHFMaker::kAnalyze) {
 
     // -- call method of daughter class
     iReturn = MakeHF();

diff --git a/StRoot/StPicoHFMaker/StPicoHFMaker.h b/StRoot/StPicoHFMaker/StPicoHFMaker.h
@@ -24,7 +24,7 @@
  *
  *  - Set use mode of StPicoHFMaker class  via setMakerMode(...)
  *     use enum of StPicoHFMaker::eMakerMode 
- *      StPicoHFMaker::kAnalyse - don't write candidate trees, just fill histograms
+ *      StPicoHFMaker::kAnalyze - don't write candidate trees, just fill histograms
  *      StPicoHFMaker::kWrite   - write candidate trees
  *      StPicoHFMaker::kRead    - read candidate trees and fill histograms
  *
@@ -74,10 +74,10 @@ class StPicoHFMaker : public StMaker
     void setDecayMode(unsigned short us);
 
     // -- different modes to use the StPicoHFMaker class
-    //    - kAnalyse - don't write candidate trees, just fill histograms
+    //    - kAnalyze - don't write candidate trees, just fill histograms
     //    - kWrite   - write candidate trees
     //    - kRead    - read candidate trees and fill histograms
-    enum eMakerMode {kAnalyse, kWrite, kRead};
+    enum eMakerMode {kAnalyze, kWrite, kRead};
 
     // -- TO BE IMPLEMENTED BY DAUGHTER CLASS
     virtual bool  isPion(StPicoTrack const*, float const & bTofBeta) const   { return true; }

diff --git a/StRoot/StPicoHFMyAnaMaker/StPicoHFMyAnaMaker.cxx b/StRoot/StPicoHFMyAnaMaker/StPicoHFMyAnaMaker.cxx
@@ -61,18 +61,18 @@ int StPicoHFMyAnaMaker::MakeHF() {
   //    ADD YOUR PROCESSING CODE HERE
   //    ... it is usefull to use the methods below
   //     - createCandidates()
-  //     - analyseCandidates()
+  //     - analyzeCandidates()
 
   if (isMakerMode() == StPicoHFMaker::kWrite) {
     createCandidates();
   }
   else if (isMakerMode() == StPicoHFMaker::kRead) {
     // -- the reading back of the perviously written trees happens in the background
-    analyseCandidates();
+    analyzeCandidates();
   }
-  else if (isMakerMode() == StPicoHFMaker::kAnalyse) {
+  else if (isMakerMode() == StPicoHFMaker::kAnalyze) {
     createCandidates();
-    analyseCandidates();
+    analyzeCandidates();
   }
 
   return kStOK;
@@ -111,8 +111,8 @@ int StPicoHFMyAnaMaker::createCandidates() {
 }
 
 // _________________________________________________________
-int StPicoHFMyAnaMaker::analyseCandidates() {
-  // -- analyse pairs/triplet, which have been filled in arrays 
+int StPicoHFMyAnaMaker::analyzeCandidates() {
+  // -- analyze pairs/triplet, which have been filled in arrays 
   //    (in StPicoHFEvent) before ( via createCandidates() or via reading back from trees )
   //    fill histograms or nTuples ... etc
 

diff --git a/StRoot/StPicoHFMyAnaMaker/StPicoHFMyAnaMaker.h b/StRoot/StPicoHFMyAnaMaker/StPicoHFMyAnaMaker.h
@@ -27,7 +27,7 @@
  *
  *  - Set use mode of StPicoHFMaker class  via setMakerMode(...)
  *     use enum of StPicoHFMaker::eMakerMode
- *      StPicoHFMaker::kAnalyse - don't write candidate trees, just fill histograms
+ *      StPicoHFMaker::kAnalyze - don't write candidate trees, just fill histograms
  *      StPicoHFMaker::kWrite   - write candidate trees
  *      StPicoHFMaker::kRead    - read candidate trees and fill histograms
  *
@@ -87,7 +87,7 @@ class StPicoHFMyAnaMaker : public StPicoHFMaker
  private:
 
   int createCandidates();
-  int analyseCandidates();
+  int analyzeCandidates();
 
   // -- private members --------------------------
 

diff --git a/StRoot/macros/runPicoHFMyAnaMaker.C b/StRoot/macros/runPicoHFMyAnaMaker.C
@@ -4,7 +4,7 @@
  * --------------------------------------------------
  *   
  *  - Different modes to use the  class
- *    - StPicoHFMaker::kAnalyse - don't write candidate trees, just fill histograms
+ *    - StPicoHFMaker::kAnalyze - don't write candidate trees, just fill histograms
  *        inputFile : fileList of PicoDst files or single picoDst file
  *        outputFile: baseName for outfile 
  *    - StPicoHFMaker::kWrite   - write candidate trees
@@ -34,7 +34,7 @@ class StPicoDstMaker;
 
 StChain *chain;
 
-void runPicoHFMyAnaMaker(const Char_t *inputFile="test.list", const Char_t *outputFile="outputBaseName",  unsigned int makerMode = 0 /*kAnalyse*/) { 
+void runPicoHFMyAnaMaker(const Char_t *inputFile="test.list", const Char_t *outputFile="outputBaseName",  unsigned int makerMode = 0 /*kAnalyze*/) { 
   // -- Check STAR Library. Please set SL_version to the original star library used in the production 
   //    from http://www.star.bnl.gov/devcgi/dbProdOptionRetrv.pl
   string SL_version = "SL15c";
@@ -56,7 +56,7 @@ void runPicoHFMyAnaMaker(const Char_t *inputFile="test.list", const Char_t *outp
   chain = new StChain();
 
   // ========================================================================================
-  //makerMode    = StPicoHFMaker::kAnalyse;
+  //makerMode    = StPicoHFMaker::kAnalyze;
   // ========================================================================================
 
   cout << "Maker Mode    " << makerMode << endl;
@@ -65,7 +65,7 @@ void runPicoHFMyAnaMaker(const Char_t *inputFile="test.list", const Char_t *outp
   TString sInputFile(inputFile);
   TString sInputListHF("");  
 
-  if (makerMode == StPicoHFMaker::kAnalyse) {
+  if (makerMode == StPicoHFMaker::kAnalyze) {
     if (!sInputFile.Contains(".list") && !sInputFile.Contains("picoDst.root")) {
       cout << "No input list or picoDst root file provided! Exiting..." << endl;
       exit(1);