StGenericVertex: Clean up code

[skip build]

Author: plexoos

StRoot/StGenericVertexMaker/Minuit/StMinuitVertexFinder.cxx

@@ -25,6 +25,7 @@ std::vector<UShort_t>           StMinuitVertexFinder::mHelixFlags;
 std::vector<Double_t >          StMinuitVertexFinder::mZImpact;
 Bool_t                     StMinuitVertexFinder::requireCTB;
 Int_t                      StMinuitVertexFinder::nCTBHits;
+
 //==========================================================
 //==========================================================
 void StMinuitVertexFinder::Clear(){

StRoot/StGenericVertexMaker/StCtbUtility.cxx

@@ -114,8 +114,6 @@ void  StCtbUtility::collectCTBhitsMC(St_DataSet *gds){// M-C CTB
 
 
   gMessMgr->Message("","I") << mCtbHits.size() << " CTB slats accepted from M-C data"<<endm;
-  
-  return ;
 }
 
 
@@ -133,7 +131,6 @@ void  StCtbUtility::collectCTBhitsData(StTriggerData *trgD){
     return ;
   }
 
-  //assert(trgD);
   for (UInt_t slat = 0; slat < 2; slat++) 
     for (UInt_t tray = 0; tray < 120; tray++) {
       ctbHit curHit;
@@ -143,27 +140,6 @@ void  StCtbUtility::collectCTBhitsData(StTriggerData *trgD){
       ctb_get_slat_from_data(slat,tray,curHit.phi, curHit.eta);
       mCtbHits.push_back(curHit);
     }
-
-#if 0
-  // old method , run just for cross check, delete later, JB
-
-  StTriggerDetectorCollection* trigCol = event->triggerDetectorCollection();
-  if(!trigCol){
-    LOG_WARN << "StCtbUtility scans: no trigCol in Data" << endm;
-    return ;
-  }
-
-  StCtbTriggerDetector* ctbDet = &(trigCol->ctb());
-  for (UInt_t slat = 0; slat < ctbDet->numberOfSlats(); slat++) 
-    for (UInt_t tray = 0; tray < ctbDet->numberOfTrays(); tray++) {
-      ctbHit curHit;
-      curHit.adc = ctbDet->mips(tray,slat,0);
-      if(curHit.adc<mCtbThres_ch) continue;
-      LOG_INFO<<Form("A sl=%3d tr=%3d  %4f\n",slat,tray, curHit.adc )<<endm;
-    }
-  
-#endif
-  return ;
 }
 
 
@@ -178,4 +154,3 @@ void  StCtbUtility::printCtb() {
            ,mCtbHits[ih].eta,mCtbHits[ih].phi/3.1416*180,mCtbHits[ih].adc)<<endm;
   }
 }
-     

StRoot/StGenericVertexMaker/StiPPVertex/BtofHitList.h

@@ -1,19 +1,9 @@
 #ifndef BtofHitList_h
 #define BtofHitList_h
 
-#include "StGenericVertexMaker/StiPPVertex/ScintHitList.h"
 #include <vector>
 
-#ifndef ST_NO_NAMESPACES
-using std::vector;
-#endif
-#ifndef __CINT__
-#if !defined(ST_NO_TEMPLATE_DEF_ARGS)
-typedef vector<Int_t>  IntVec;
-#else
-typedef vector<Int_t, allocator<Int_t> >  IntVec;
-#endif
-#endif
+#include "StGenericVertexMaker/StiPPVertex/ScintHitList.h"
 
 class StBTofTables;
 class StBTofCollection;
@@ -37,10 +27,10 @@ class BtofHitList : public ScintHitList {
   void build(StBTofCollection *btofColl);
   int  cell2bin(int tray, int module, int cell);
   int  addBtofTrack(int tray, int module, int cell);
-  int  addBtofMatch(IntVec ibinVec);
-  bool isMatched(IntVec ibinVec);
-  bool isVetoed(IntVec ibinVec);
-  float getWeight(IntVec ibinVec);
+  int  addBtofMatch(std::vector<int> ibinVec);
+  bool isMatched(std::vector<int> ibinVec);
+  bool isVetoed(std::vector<int> ibinVec);
+  float getWeight(std::vector<int> ibinVec);
   virtual   int etaBin(float eta);
   virtual float bin2EtaLeft(int iEta);
 

StRoot/StGenericVertexMaker/StppLMVVertexFinder.h

@@ -54,13 +54,9 @@ class StppLMVVertexFinder: public StGenericVertexFinder , StCtbUtility {
     int    eveID;
     int    NCtbMatches();
 
-    /*!
-     * \struct
-     */
     struct JHelix {StPhysicalHelixD helix; float sigma; };
 
-    vector<JHelix> mPrimCand;
-
+    std::vector<JHelix> mPrimCand;
 };