Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions StRoot/RTS/src/DAQ_TPX/tpxFCF.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1617,6 +1617,10 @@ void tpxFCF::dump(tpxFCF_cl *cl, int row)

}

if(do_cuts==1 && run_compatibility >= 22) { // ADDED in FY22, pp500
// kill ONEDPAD unless they fall before the trigger
if((cl->t_max > 20) && (fla & FCF_ONEPAD)) return ;
}
}


Expand Down
4 changes: 2 additions & 2 deletions StRoot/RTS/src/DAQ_TPX/tpxGain.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ void tpxGain::do_default(int sec)
return ;
}

int tpxGain::from_file(char *fname, int sec)
int tpxGain::from_file(const char *fname, int sec)
{
FILE *f ;
int s, r, p ;
Expand Down Expand Up @@ -999,7 +999,7 @@ int tpxGain::from_file(char *fname, int sec)
}


int tpxGain::to_file(char *fname)
int tpxGain::to_file(const char *fname)
{

FILE *f ;
Expand Down
4 changes: 2 additions & 2 deletions StRoot/RTS/src/DAQ_TPX/tpxGain.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class tpxGain
return (gains[s-1] + r*TPX_MAX_PAD + (p-1)) ;
}

int from_file(char *fname, int sector = 0) ;
int from_file(const char *fname, int sector = 0) ;


// [sector 1-24][RDO 1-6][fee-index 0-35]
Expand Down Expand Up @@ -193,7 +193,7 @@ class tpxGain


// below used only during calculation
int to_file(char *fname) ;
int to_file(const char *fname) ;

void init(int sec=0) ; // zap's structs; assume all TPX
void accum(char *evbuff, int bytes) ; // parses one RDO's worth of pulser data
Expand Down
11 changes: 0 additions & 11 deletions StRoot/StTpcHitMaker/StTpcHitMaker.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -442,17 +442,6 @@ Int_t StTpcHitMaker::Make() {
LOG_WARN << "TPC status indicates it is unusable for this event. Ignoring hits." << endm;
return kStOK;
}
#ifdef __GENE__ /* I have no idea what the codes after */
if ( kMode == kTpx || kMode == kTpc || kMode == kiTPC ) {
pEvent = dynamic_cast<StEvent *> (GetInputDS("StEvent"));
if (Debug()) {LOG_INFO << "StTpcHitMaker::Make : StEvent has been retrieved " <<pEvent<< endm;}
if (! pEvent) {LOG_INFO << "StTpcHitMaker::Make : StEvent has not been found " << endm; return kStWarn;}
pHitCollection = pEvent->tpcHitCollection();
} else {
pEvent = 0;
pHitCollection = 0;
}
#endif

static Int_t minSector = IAttr("minSector");
static Int_t maxSector = IAttr("maxSector");
Expand Down
356 changes: 356 additions & 0 deletions StRoot/StTpcHitMaker/StTpcHitMaker.flow

Large diffs are not rendered by default.

Loading