Skip to content

Commit

Permalink
revert StMuDSTMaker since it is covered in PR-538
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdbrice
jdbrice committed Jul 26, 2023
1 parent 6088f97 commit ae1dae2
Show file tree
Hide file tree
Showing 7 changed files with 92 additions and 185 deletions.
24 changes: 8 additions & 16 deletions StRoot/StMuDSTMaker/COMMON/StMuArrays.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,10 @@ const char* StMuArrays::arrayNames [__NALLARRAYS__ ] = {"MuEvent","PrimaryVer
"EEmcPrs","EEmcSmdu","EEmcSmdv",
/*pmdArrayNames [__NPMDARRAYS__ ]*/ "PmdHit","CpvHit", "PmdCluster", "CpvCluster",
/*fmsArrayNames [__NFMSARRAYS__ ]*/ "FmsHit","FmsCluster","FmsPoint","FmsInfo",
/*rhicfArrayNames [__NRHICFARRAYS__ ]*/ "RHICfRawHit","RHICfHit","RHICfPoint",
/*rhicfArrayNames [__NRHICFARRAYS__ ]*/ "RHICfRawHit","RHICfHit","RHICfPoint",
/*fcsArrayNames [__NFCSARRAYS__ ]*/ "FcsHit","FcsCluster","FcsPoint", "FcsInfo",
/*fttArrayNames [__NFTTARRAYS__ ]*/ "FttRawHit","FttCluster","FttPoint",
/*fstArrayNames [__NFSTARRAYS__ ]*/ "FstRawHit", "FstHit",
/*fwdTrackArrayNames [__NFWDTRACKARRAYS__ ]*/ "FwdTrack",
/*tofArrayNames [__NTOFARRAYS__ ]*/ "TofHit","TofData", "TofRawData",
/*btofArrayNames [__NBTOFARRAYS__ ]*/ "BTofHit","BTofRawHit","BTofHeader", // dongx
/*etofArrayNames [__NETOFARRAYS__ ]*/ "ETofDigi","ETofHit","ETofHeader", // jdb
Expand All @@ -54,8 +53,7 @@ const char** StMuArrays::rhicfArrayNames = StMuArrays::fmsArrayNames +__NFMSARR
const char** StMuArrays::fcsArrayNames = StMuArrays::rhicfArrayNames +__NRHICFARRAYS__;
const char** StMuArrays::fttArrayNames = StMuArrays::fcsArrayNames +__NFCSARRAYS__;
const char** StMuArrays::fstArrayNames = StMuArrays::fttArrayNames +__NFTTARRAYS__;
const char** StMuArrays::fwdTrackArrayNames = StMuArrays::fstArrayNames +__NFSTARRAYS__;
const char** StMuArrays::tofArrayNames = StMuArrays::fwdTrackArrayNames +__NFWDTRACKARRAYS__;
const char** StMuArrays::tofArrayNames = StMuArrays::fstArrayNames +__NFSTARRAYS__;
const char** StMuArrays::btofArrayNames = StMuArrays::tofArrayNames +__NTOFARRAYS__; // dongx
const char** StMuArrays::etofArrayNames = StMuArrays::btofArrayNames +__NBTOFARRAYS__; // jdb
const char** StMuArrays::epdArrayNames = StMuArrays::etofArrayNames +__NETOFARRAYS__; // MALisa
Expand All @@ -82,11 +80,10 @@ const char* StMuArrays::arrayTypes [__NALLARRAYS__ ] = {"StMuEvent","StMuPrim
"StMuEmcHit","StMuEmcHit","StMuEmcHit","StMuEmcHit","StMuEmcHit",
/*pmdArrayTypes [__NPMDARRAYS__ ]*/ "StMuPmdHit","StMuPmdHit","StMuPmdCluster","StMuPmdCluster",
/*fmsArrayTypes [__NFMSARRAYS__ ]*/ "StMuFmsHit","StMuFmsCluster","StMuFmsPoint","StMuFmsInfo",
/*rhicfArrayTypes [__NRHICfARRAYS__ ]*/ "StMuRHICfRawHit","StMuRHICfHit","StMuRHICfPoint",
/*rhicfArrayTypes [__NRHICfARRAYS__ ]*/ "StMuRHICfRawHit","StMuRHICfHit","StMuRHICfPoint",
/*fcsArrayTypes [__NFCSARRAYS__ ]*/ "StMuFcsHit","StMuFcsCluster","StMuFcsPoint","StMuFcsInfo",
/*fttArrayTypes [__NFTTARRAYS__ ]*/ "StMuFttRawHit","StMuFttCluster","StMuFttPoint",
/*fstArrayTypes [__NFSTARRAYS__ ]*/ "StMuFstRawHit","StMuFstHit",
/*fwdTrackArrayTypes [__NFWDTRACKARRAYS__ ]*/ "StMuFwdTrack",
/*tofArrayTypes [__NTOFARRAYS__ ]*/ "StMuTofHit","StTofData","StTofRawData",
/*btofArrayTypes [__NBTOFARRAYS__ ]*/ "StMuBTofHit","StBTofRawHit","StBTofHeader", // dongx
/*etofArrayTypes [__NETOFARRAYS__ ]*/ "StMuETofDigi","StMuETofHit","StMuETofHeader", // jdb+fseck
Expand All @@ -107,8 +104,7 @@ const char** StMuArrays::rhicfArrayTypes = StMuArrays::fmsArrayTypes +__NFMSAR
const char** StMuArrays::fcsArrayTypes = StMuArrays::rhicfArrayTypes +__NRHICFARRAYS__;
const char** StMuArrays::fttArrayTypes = StMuArrays::fcsArrayTypes +__NFCSARRAYS__;
const char** StMuArrays::fstArrayTypes = StMuArrays::fttArrayTypes +__NFTTARRAYS__;
const char** StMuArrays::fwdTrackArrayTypes = StMuArrays::fstArrayTypes +__NFSTARRAYS__;
const char** StMuArrays::tofArrayTypes = StMuArrays::fwdTrackArrayTypes +__NFWDTRACKARRAYS__;
const char** StMuArrays::tofArrayTypes = StMuArrays::fstArrayTypes +__NFSTARRAYS__;
const char** StMuArrays::btofArrayTypes = StMuArrays::tofArrayTypes +__NTOFARRAYS__; // dongx
const char** StMuArrays::etofArrayTypes = StMuArrays::btofArrayTypes +__NBTOFARRAYS__; // jdb
const char** StMuArrays::epdArrayTypes = StMuArrays::etofArrayTypes +__NETOFARRAYS__; // MALisa
Expand All @@ -129,11 +125,10 @@ int StMuArrays::arraySizes [__NALLARRAYS__ ] = {1,10,1000,1000,1000,1
/*emcArraySizes [__NEMCARRAYS__ ]*/ 1,1000,1000,1000,1000,1000,1000,
/*pmdArraySizes [__NPMDARRAYS__ ]*/ 1000,1000,1000,1000,
/*fmsArraySizes [__NFMSARRAYS__ ]*/ 1,1,1,1,
/*rhicfArraySizes [__NRHICFARRAYS__ ]*/ 1,1,1,
/*rhicfArraySizes [__NRHICFARRAYS__ ]*/ 1,1,1,
/*fcsArraySizes [__NFCSARRAYS__ ]*/ 1,1,1,1,
/*fttArraySizes [__NFTTARRAYS__ ]*/ 1,1,1,
/*fstArraySizes [__NFSTARRAYS__ ]*/ 1,1,
/*fwdTrackArraySizes [__NFWDTRACKARRAYS__ ]*/ 1,
/*tofArraySizes [__NTOFARRAYS__ ]*/ 100, 200, 1000,
/*btofArraySizes [__NBTOFARRAYS__ ]*/ 1000,1000,1, // dongx
/*etofArraySizes [__NETOFARRAYS__ ]*/ 1000,1000,1, // jdb
Expand All @@ -154,8 +149,7 @@ int* StMuArrays::rhicfArraySizes = StMuArrays::fmsArraySizes +__NFMSARRAYS__;
int* StMuArrays::fcsArraySizes = StMuArrays::rhicfArraySizes +__NRHICFARRAYS__;
int* StMuArrays::fttArraySizes = StMuArrays::fcsArraySizes +__NFCSARRAYS__;
int* StMuArrays::fstArraySizes = StMuArrays::fttArraySizes +__NFTTARRAYS__;
int* StMuArrays::fwdTrackArraySizes = StMuArrays::fstArraySizes +__NFSTARRAYS__;
int* StMuArrays::tofArraySizes = StMuArrays::fwdTrackArraySizes +__NFWDTRACKARRAYS__;
int* StMuArrays::tofArraySizes = StMuArrays::fstArraySizes +__NFSTARRAYS__;
int* StMuArrays::btofArraySizes = StMuArrays::tofArraySizes +__NTOFARRAYS__; // dongx
int* StMuArrays::etofArraySizes = StMuArrays::btofArraySizes +__NBTOFARRAYS__; // jdb
int* StMuArrays::epdArraySizes = StMuArrays::etofArraySizes +__NETOFARRAYS__; // MALisa
Expand All @@ -173,11 +167,10 @@ int StMuArrays::arrayCounters [__NALLARRAYS__ ] = {0,0,0,0,0,0,0,0,0,0,0
/*emcArrayCounters [__NEMCARRAYS__ ]*/ 0,0,0,0,0,0,0,
/*pmdArrayCounters [__NPMDARRAYS__ ]*/ 0,0,0,0,
/*fmsArrayCounters [__NFMSARRAYS__ ]*/ 0,0,0,0,
/*rhicfArrayCounters [__NRHICFARRAYS__ ]*/ 0,0,0,
/*rhicfArrayCounters [__NRHICFARRAYS__ ]*/ 0,0,0,
/*fcsArrayCounters [__NFCSARRAYS__ ]*/ 0,0,0,0,
/*fttArrayCounters [__NFTTARRAYS__ ]*/ 0,0,0,
/*fstArrayCounters [__NFSTARRAYS__ ]*/ 0,0,
/*fwdTrackArrayCounters [__NFWDTRACKARRAYS__ ]*/ 0,
/*tofArrayCounters [__NTOFARRAYS__ ]*/ 0, 0, 0,
/*btofArrayCounters [__NBTOFARRAYS__ ]*/ 0, 0, 0, // dongx
/*etofArrayCounters [__NETOFARRAYS__ ]*/ 0, 0, 0, // jdb
Expand All @@ -200,8 +193,7 @@ int* StMuArrays::rhicfArrayCounters = StMuArrays::fmsArrayCounters +__NFMSARRA
int* StMuArrays::fcsArrayCounters = StMuArrays::rhicfArrayCounters +__NRHICFARRAYS__;
int* StMuArrays::fttArrayCounters = StMuArrays::fcsArrayCounters +__NFCSARRAYS__;
int* StMuArrays::fstArrayCounters = StMuArrays::fttArrayCounters +__NFTTARRAYS__;
int* StMuArrays::fwdTrackArrayCounters = StMuArrays::fstArrayCounters +__NFSTARRAYS__;
int* StMuArrays::tofArrayCounters = StMuArrays::fwdTrackArrayCounters +__NFWDTRACKARRAYS__;
int* StMuArrays::tofArrayCounters = StMuArrays::fstArrayCounters +__NFSTARRAYS__;
int* StMuArrays::btofArrayCounters = StMuArrays::tofArrayCounters +__NTOFARRAYS__; // dongx
int* StMuArrays::etofArrayCounters = StMuArrays::btofArrayCounters +__NBTOFARRAYS__; // jdb
int* StMuArrays::epdArrayCounters = StMuArrays::etofArrayCounters +__NETOFARRAYS__; // MALisa
Expand Down
27 changes: 10 additions & 17 deletions StRoot/StMuDSTMaker/COMMON/StMuArrays.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ enum fcsTypes {muFcsHit=0, muFcsCluster, muFcsPoint, muFcsInfo};

enum fttTypes {muFttRawHit=0, muFttCluster, muFttPoint};

enum fwdTrackTypes {muFwdTrack=0};

enum fstTypes {muFstRawHit=0, muFstHit};
#ifndef __NO_STRANGE_MUDST__
/// @enum strangeTypes enumeration to to index the strangeArrays
Expand Down Expand Up @@ -69,11 +67,10 @@ __NMCARRAYS__ =2, ///< size of the MCness arrays, i.e. number of TClonesArr
__NEMCARRAYS__ =7 , ///< size of the emc arrays, i.e. number of TClonesArrays
__NPMDARRAYS__ =4 , ///< size of the pmd arrays, i.e. number of TClonesArrays
__NFMSARRAYS__ =4 , ///< size of the fms arrays, i.e. number of TClonesArrays
__NRHICFARRAYS__ =3 , ///< size of the RHICf arrays, i.e. number of TClonesArrays
__NFCSARRAYS__ =4 , ///< size of the fcs arrays, i.e. number of TClonesArrays
__NFTTARRAYS__ =3 , ///< size of the ftt arrays, i.e. number of TClonesArrays
__NFSTARRAYS__ =2 , ///< size of the fst arrays, i.e. number of TClonesArrays
__NFWDTRACKARRAYS__ =1 , ///< size of the fwd track arrays, i.e. number of TClonesArrays
__NRHICFARRAYS__ =3 , ///< size of the RHICf arrays, i.e. number of TClonesArrays
__NFCSARRAYS__ =4 , ///< size of the fcs arrays, i.e. number of TClonesArrays
__NFTTARRAYS__ =3 , ///< size of the ftt arrays, i.e. number of TClonesArrays
__NFSTARRAYS__ =2 , ///< size of the fst arrays, i.e. number of TClonesArrays
// run 5 - dongx
__NTOFARRAYS__ =3 , ///< size of the tof arrays >
__NBTOFARRAYS__ =3 , /// dongx
Expand All @@ -85,9 +82,9 @@ __NEZTARRAYS__ =5 , ///< size of the ez arrays >

/// dongx
#ifndef __NO_STRANGE_MUDST__
__NALLARRAYS__ = __NARRAYS__+__NSTRANGEARRAYS__+__NMCARRAYS__+__NEMCARRAYS__+__NFMSARRAYS__+__NRHICFARRAYS__+__NFCSARRAYS__+__NFTTARRAYS__+__NFSTARRAYS__+__NFWDTRACKARRAYS__+__NPMDARRAYS__+__NTOFARRAYS__+__NBTOFARRAYS__+__NETOFARRAYS__+__NEPDARRAYS__+__NMTDARRAYS__+__NFGTARRAYS__+__NEZTARRAYS__
__NALLARRAYS__ = __NARRAYS__+__NSTRANGEARRAYS__+__NMCARRAYS__+__NEMCARRAYS__+__NFMSARRAYS__+__NRHICFARRAYS__+__NFCSARRAYS__+__NFTTARRAYS__+__NFSTARRAYS__+__NPMDARRAYS__+__NTOFARRAYS__+__NBTOFARRAYS__+__NETOFARRAYS__+__NEPDARRAYS__+__NMTDARRAYS__+__NFGTARRAYS__+__NEZTARRAYS__
#else
__NALLARRAYS__ = __NARRAYS__+__NMCARRAYS__+__NEMCARRAYS__+__NFMSARRAYS__+__NRHICFARRAYS__+__NFCSARRAYS__+__NFTTARRAYS__+__NFSTARRAYS__+__NFWDTRACKARRAYS__+__NPMDARRAYS__+__NTOFARRAYS__+__NBTOFARRAYS__+__NETOFARRAYS__+__NEPDARRAYS__+__NMTDARRAYS__+__NFGTARRAYS__+__NEZTARRAYS__
__NALLARRAYS__ = __NARRAYS__+__NMCARRAYS__+__NEMCARRAYS__+__NFMSARRAYS__+__NRHICFARRAYS__+__NFCSARRAYS__+__NFTTARRAYS__+__NFSTARRAYS__+__NPMDARRAYS__+__NTOFARRAYS__+__NBTOFARRAYS__+__NETOFARRAYS__+__NEPDARRAYS__+__NMTDARRAYS__+__NFGTARRAYS__+__NEZTARRAYS__
#endif
};
class StMuArrays {
Expand All @@ -103,11 +100,10 @@ class StMuArrays {
static const char** emcArrayNames;//[__NEMCARRAYS__ ]
static const char** pmdArrayNames;//[__NPMDARRAYS__ ]
static const char** fmsArrayNames;//[__NFMSARRAYS__ ]
static const char** rhicfArrayNames;//[__NRHICFARRAYS__ ]
static const char** rhicfArrayNames;//[__NRHICFARRAYS__ ]
static const char** fcsArrayNames;//[__NFCSARRAYS__ ]
static const char** fttArrayNames;//[__NFTTARRAYS__ ]
static const char** fstArrayNames;//[__NFSTARRAYS__ ]
static const char** fwdTrackArrayNames;//[__NFWDTRACKARRAYS__ ]
static const char** tofArrayNames;//[__NTOFARRAYS__ ]
static const char** btofArrayNames;//[__NBTOFARRAYS__ ] // dongx
static const char** etofArrayNames;//[__NETOFARRAYS__ ] // jdb
Expand All @@ -125,11 +121,10 @@ class StMuArrays {
static const char** emcArrayTypes;// [__NEMCARRAYS__ ]
static const char** pmdArrayTypes;// [__NPMDARRAYS__ ]
static const char** fmsArrayTypes;// [__NFMSARRAYS__ ]
static const char** rhicfArrayTypes;// [__NRHICFARRAYS__ ]
static const char** rhicfArrayTypes;// [__NRHICFARRAYS__ ]
static const char** fcsArrayTypes;// [__NFCSARRAYS__ ]
static const char** fttArrayTypes;// [__NFTTARRAYS__ ]
static const char** fstArrayTypes;// [__NFSTARRAYS__ ]
static const char** fwdTrackArrayTypes;// [__NFWDTRACKARRAYS__ ]
static const char** tofArrayTypes;// [__NTOFARRAYS__ ]
static const char** btofArrayTypes;// [__NBTOFARRAYS__ ] // dongx
static const char** etofArrayTypes;// [__NETOFARRAYS__ ] // jdb
Expand All @@ -147,11 +142,10 @@ class StMuArrays {
static int* emcArraySizes;// [__NEMCARRAYS__ ]
static int* pmdArraySizes;// [__NPMDARRAYS__ ]
static int* fmsArraySizes;// [__NFMSARRAYS__ ]
static int* rhicfArraySizes;// [__NRHICfARRAYS__ ]
static int* rhicfArraySizes;// [__NRHICfARRAYS__ ]
static int* fcsArraySizes;// [__NFCSARRAYS__ ]
static int* fttArraySizes;// [__NFTTARRAYS__ ]
static int* fstArraySizes;// [__NFSTARRAYS__ ]
static int* fwdTrackArraySizes;// [__NFWDTRACKARRAYS__ ]
static int* tofArraySizes;// [__NTOFARRAYS__ ]
static int* btofArraySizes;// [__NBTOFARRAYS__ ] // dongx
static int* etofArraySizes;// [__NETOFARRAYS__ ] // jdb
Expand All @@ -169,11 +163,10 @@ class StMuArrays {
static int* emcArrayCounters;// [__NEMCARRAYS__ ]
static int* pmdArrayCounters;// [__NPMDARRAYS__ ]
static int* fmsArrayCounters;// [__NFMSARRAYS__ ]
static int* rhicfArrayCounters;// [__NRHICFARRAYS__ ]
static int* rhicfArrayCounters;// [__NRHICFARRAYS__ ]
static int* fcsArrayCounters;// [__NFCSARRAYS__ ]
static int* fttArrayCounters;// [__NFTTARRAYS__ ]
static int* fstArrayCounters;// [__NFSTARRAYS__ ]
static int* fwdTrackArrayCounters;// [__NFWDTRACKARRAYS__ ]
static int* tofArrayCounters;// [__NTOFARRAYS__ ]
static int* btofArrayCounters;// [__NBTOFARRAYS__ ] // dongx
static int* etofArrayCounters;// [__NETOFARRAYS__ ] // jdb
Expand Down

0 comments on commit ae1dae2

Please sign in to comment.