diff --git a/CHANGELOG.md b/CHANGELOG.md index 7adb816ca36..cfdd4567cf7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,76 @@ # Changelog +## SL23a_0 - 2023-01-15 + +## What's Changed + +* ci: Bump starenv to v0.2.3 by @plexoos in ([#399](https://github.com/star-bnl/star-sw/pull/399)) +* Remove OnlTools/OnlinePlots by @plexoos in ([#407](https://github.com/star-bnl/star-sw/pull/407)) +* Separate out FCS cluster seed thresholds by @akioogawa in ([#400](https://github.com/star-bnl/star-sw/pull/400)) +* cons: Use `mysql_config` to set up external dependency for mysql by @plexoos in ([#402](https://github.com/star-bnl/star-sw/pull/402)) +* cons: Use xml2-config to set up external dependency by @plexoos in ([#404](https://github.com/star-bnl/star-sw/pull/404)) +* cons: Use pkg-config to set up external dependency on log4cxx by @plexoos in ([#405](https://github.com/star-bnl/star-sw/pull/405)) +* Assorted updates to StRoot/RTS, including `char *` issue by @jml985 in ([#406](https://github.com/star-bnl/star-sw/pull/406)) +* Update CODEOWNERS by @JohnTheBlindMilkman in ([#414](https://github.com/star-bnl/star-sw/pull/414)) +* Add issue template for bug reports by @plexoos in ([#391](https://github.com/star-bnl/star-sw/pull/391)) +* SpinPool Fcs pi0 finder fixing a crash by @akioogawa in ([#412](https://github.com/star-bnl/star-sw/pull/412)) +* Bug fix on tower Et calculation for the tower selection before jet finder by @zlchang in ([#403](https://github.com/star-bnl/star-sw/pull/403)) +* ci: Disable test throwing a `std::bad_alloc` by @plexoos in ([#420](https://github.com/star-bnl/star-sw/pull/420)) +* ci: Upgrade GitHub actions by @plexoos in ([#419](https://github.com/star-bnl/star-sw/pull/419)) +* Stargenerator Vertexing Options by @klendathu2k in ([#408](https://github.com/star-bnl/star-sw/pull/408)) +* Fix copy of eTOF good channel flags to PicoEvent by @PhilippWeidenkaff in ([#416](https://github.com/star-bnl/star-sw/pull/416)) +* ci: Switch to using specific version (v5) of test data container by @plexoos in ([#418](https://github.com/star-bnl/star-sw/pull/418)) +* Add scripts to load dependency packages via Environment Modules by @jdbrice in ([#409](https://github.com/star-bnl/star-sw/pull/409)) +* ci: Add test for FST chain with `st_fwd` stream data by @plexoos in ([#421](https://github.com/star-bnl/star-sw/pull/421)) +* Encode Geometry Tag w/in DB macros by @klendathu2k in ([#422](https://github.com/star-bnl/star-sw/pull/422)) +* [root6] Modify StRoot/StBFChain/BFC.C for ROOT6/cling by @klendathu2k in ([#423](https://github.com/star-bnl/star-sw/pull/423)) +* change for yuri by @jml985 in ([#429](https://github.com/star-bnl/star-sw/pull/429)) +* Avoid pointer cast to `time_t` from incompatible type by @plexoos in ([#427](https://github.com/star-bnl/star-sw/pull/427)) +* ci: Enable more tests using star-test-data:v6 by @plexoos in ([#415](https://github.com/star-bnl/star-sw/pull/415)) +* Fix GCC warning: forbidden conversion to `char*` by @plexoos in ([#389](https://github.com/star-bnl/star-sw/pull/389)) +* Change TPX gain loading interface from `fTpx->put(... to fTpx->gain_al` by @fisyak in ([#417](https://github.com/star-bnl/star-sw/pull/417)) +* ci: Delete untagged images after successful build by @plexoos in ([#430](https://github.com/star-bnl/star-sw/pull/430)) +* docker: Add latest tag to default build configuration by @plexoos in ([#433](https://github.com/star-bnl/star-sw/pull/433)) +* ci: Turn off CI for certain directories by @plexoos in ([#434](https://github.com/star-bnl/star-sw/pull/434)) +* new ETOF table requested by Yannick by @dmarkh in ([#435](https://github.com/star-bnl/star-sw/pull/435)) +* Add .devcontainer for GitHub codespaces by @plexoos in ([#438](https://github.com/star-bnl/star-sw/pull/438)) +* Set search paths for included files for ROOT C++ interpreter by @plexoos in ([#441](https://github.com/star-bnl/star-sw/pull/441)) +* [root6] StEvent/StEnumerations.cxx fix by @klendathu2k in ([#440](https://github.com/star-bnl/star-sw/pull/440)) +* Update to StFcsWaveformFitMaker to use new algorithm by @dkapukchyan in ([#401](https://github.com/star-bnl/star-sw/pull/401)) +* Add FST raw hits in StEvent and StMuDst by @techuan-huang in ([#378](https://github.com/star-bnl/star-sw/pull/378)) +* [geometry] Add y2023 first cut and y2022a production geometries by @klendathu2k in ([#432](https://github.com/star-bnl/star-sw/pull/432)) +* [root6] Set attributes on StrangeMuDstMaker in StBFChain, rather than using interpreter to configure by @klendathu2k in ([#444](https://github.com/star-bnl/star-sw/pull/444)) +* [root6] Eliminate crash when creating the MuDst by @klendathu2k in ([#442](https://github.com/star-bnl/star-sw/pull/442)) +* New RHICf table for Seunghwan by @dmarkh in ([#446](https://github.com/star-bnl/star-sw/pull/446)) +* [root6] Fix undeclared identifier 'chain' in StarDb/AgMLGeometry/Geometry...C macro by @plexoos in ([#448](https://github.com/star-bnl/star-sw/pull/448)) +* Adding eq4 for StTriggerData by @akioogawa in ([#450](https://github.com/star-bnl/star-sw/pull/450)) +* build-pull-request.yml: cancel previous workflows by @veprbl in ([#453](https://github.com/star-bnl/star-sw/pull/453)) +* Minimum viable pentagonal sTGC geometry with misalignment by @jdbrice in ([#447](https://github.com/star-bnl/star-sw/pull/447)) +* Update to trigger simulator to save intermediate jet patch ADCs and minor cleanup to the jet maker by @zlchang in ([#424](https://github.com/star-bnl/star-sw/pull/424)) +* build: Treat all warnings as errors by @plexoos in ([#445](https://github.com/star-bnl/star-sw/pull/445)) +* Remove StBFChain dependence in StarDb/AgMLGeometry/CreateGeometry.h by @klendathu2k in ([#462](https://github.com/star-bnl/star-sw/pull/462)) +* [root6] Address issues in TTable when interpreted by Cling by @plexoos in ([#449](https://github.com/star-bnl/star-sw/pull/449)) +* update TpcRS parameters for Run19 AuAu19.6 GeV embedding by @zhux97 in ([#463](https://github.com/star-bnl/star-sw/pull/463)) +* Revert "Remove StBFChain dependence in StarDb/AgMLGeometry/CreateGeometry.h (#462)" (partially) by @plexoos in ([#468](https://github.com/star-bnl/star-sw/pull/468)) +* docker: Exit build immediately with non-zero status by @plexoos in ([#469](https://github.com/star-bnl/star-sw/pull/469)) +* Hide include directive from ROOT5 interpreter by @klendathu2k in ([#456](https://github.com/star-bnl/star-sw/pull/456)) +* cons: Extend `SKIP_DIRS` to match arbitrary path by @plexoos in ([#467](https://github.com/star-bnl/star-sw/pull/467)) +* StGenericVertex: Clean up #include statements by @plexoos in ([#443](https://github.com/star-bnl/star-sw/pull/443)) +* Run XIX-XXII new dE/dx model and calibration by @fisyak in ([#464](https://github.com/star-bnl/star-sw/pull/464)) +* ci: Improve image tagging by @plexoos in ([#474](https://github.com/star-bnl/star-sw/pull/474)) +* StFst: Fix GCC 4.8.5 warnings by @plexoos in ([#472](https://github.com/star-bnl/star-sw/pull/472)) +* ci: Add more tests by @plexoos in ([#473](https://github.com/star-bnl/star-sw/pull/473)) +* StETofHitMaker: Fix unused variable warnings by @plexoos in ([#471](https://github.com/star-bnl/star-sw/pull/471)) +* Update clock jump correction, add new method for hit manipulation on counter level by @YannickSoehngen in ([#457](https://github.com/star-bnl/star-sw/pull/457)) + +## New Contributors + +* @JohnTheBlindMilkman made their first contribution in ([#414](https://github.com/star-bnl/star-sw/pull/414)) +* @dkapukchyan made their first contribution in ([#401](https://github.com/star-bnl/star-sw/pull/401)) + +**Full Changelog**: https://github.com/star-bnl/star-sw/compare/SL22c_0...SL23a_0 + + ## SL22c_0 - 2022-09-09 * ci: Expand tests with 2012, 2021, and 2022 data samples by @plexoos in ([#371](https://github.com/star-bnl/star-sw/pull/371)) diff --git a/StRoot/StETofHitMaker/StETofHitMaker.cxx b/StRoot/StETofHitMaker/StETofHitMaker.cxx index e0769078b53..b5118252ade 100644 --- a/StRoot/StETofHitMaker/StETofHitMaker.cxx +++ b/StRoot/StETofHitMaker/StETofHitMaker.cxx @@ -75,9 +75,15 @@ #include "StETofHitMaker.h" #include "StETofUtil/StETofConstants.h" +#include "StETofUtil/StETofGeometry.h" #include "tables/St_etofHitParam_Table.h" #include "tables/St_etofSignalVelocity_Table.h" +#include "tables/St_etofModCounter_Table.h" + +#include "StarClassLibrary/SystemOfUnits.h" +#include "StarClassLibrary/PhysicalConstants.h" +#include "StBTofUtil/tofPathLength.hh" //_____________________________________________________________ @@ -85,30 +91,35 @@ StETofHitMaker::StETofHitMaker( const char* name ) : StMaker( "etofHit", name ), mEvent( nullptr ), /// pointer to StEvent mMuDst( nullptr ), /// pointer to MuDst + mETofGeom( nullptr ), /// pointer to EToF-Geo mFileNameHitParam( "" ), mFileNameSignalVelocity( "" ), - mMaxYPos( 15. ), + mFileNameModMatrix( "" ), + mFileNameAlignParam( "" ), + mStoreDigi(), + mMapDigiIndex(), + mStoreHit(), + mMapHitDigiIndices(), + mMapHitIndexDigiIndices(), + mMaxYPos( 15. ), mMergingRadius( 1. ), - mSoftwareDeadTime( 50. ), + mSigVel(), + mSoftwareDeadTime( 5. ), mDoClockJumpShift( true ), + mDoDoubleClockJumpShift( true ), + mClockJumpDirection(), + mModMatrix(), + mGet4doublejumpTmin(-1.0), + mGet4doublejumpFlag(), + mGet4doublejumpTimes(), + mIsSim( false ), mDoQA( false ), mDebug( false ), - mHistFileName( "" ) + mHistFileName( "" ), + mHistograms(), + mCounterActive() { LOG_DEBUG << "StETofHitMaker::ctor" << endm; - - mStoreDigi.clear(); - mStoreHit.clear(); - mMapDigiIndex.clear(); - mMapHitDigiIndices.clear(); - mMapHitIndexDigiIndices.clear(); - - mSigVel.clear(); - - mClockJumpDirection.clear(); - - mHistograms.clear(); - mCounterActive.clear(); } //_____________________________________________________________ @@ -199,6 +210,8 @@ StETofHitMaker::InitRun( Int_t runnumber ) dbDataSet = GetDataBase( "Calibrations/etof/etofSignalVelocity" ); St_etofSignalVelocity* etofSignalVelocity = static_cast< St_etofSignalVelocity* > ( dbDataSet->Find( "etofSignalVelocity" ) ); + + if( !etofSignalVelocity ) { LOG_ERROR << "unable to get the signal velocity from the database" << endm; return kStFatal; @@ -248,17 +261,112 @@ StETofHitMaker::InitRun( Int_t runnumber ) } + // -------------------------------------------------------------------------------------------- + //initialize Counter Modification map (flip local xy etc.) + + if(!mFileNameModMatrix.empty()){ // "from file" + + LOG_INFO << "etofModMatrix: filename provided --> use parameter file: " << mFileNameSignalVelocity.c_str() << endm; + + paramFile.open( mFileNameModMatrix.c_str() ); + + if( !paramFile.is_open() ) { + LOG_ERROR << "unable to get the 'etofModMatrix' parameters from file --> file does not exist" << endm; + return kStFatal; + } + + std::vector< int > modMatrix; + int temp; + while( paramFile >> temp ) { + modMatrix.push_back( temp ); + } + + paramFile.close(); + + + if( modMatrix.size() != eTofConst::nCountersInSystem ) { + LOG_ERROR << "parameter file for 'etofModMatrix' has not the right amount of entries: "; + LOG_ERROR << modMatrix.size() << " instead of " << eTofConst::nCountersInSystem << " !!!!" << endm; + return kStFatal; + } + + for( size_t i=0; i 0 ) { + mModMatrix[ detectorToKey( i ) ] = modMatrix.at( i ); + } + } + + }else{ //from Db + + dbDataSet = GetDataBase( "Geometry/etof/etofModCounter" ); + + // TDataSet* dbDataSet = StMaker::GetChain()->GetDataBase("Geometry/etof/etofModCounter"); + if( !dbDataSet ) { + LOG_ERROR << "unable to get the dataset from the database" << endm; + return kStFatal; + } + + St_etofModCounter* etofModCounter = static_cast< St_etofModCounter* > ( dbDataSet->Find("etofModCounter") ); + + if( !etofModCounter ) { + LOG_WARN << "unable to get the ModMap from the database" << endm; + return kStFatal; + + }else{ + + etofModCounter_st* ModCounterTable = etofModCounter->GetTable(); + + for( size_t i=0; idetectorModFlag[ i ]; + } + } + } + // -------------------------------------------------------------------------------------------- for( int i=0; iisInitDone() ) { + LOG_INFO << " eTOF geometry initialization ... " << endm; + + if( !gGeoManager ) GetDataBase( "VmcGeometry" ); + + if( !gGeoManager ) { + LOG_ERROR << "Cannot get GeoManager" << endm; + return kStFatal; + } + + LOG_DEBUG << " gGeoManager: Should set alignment file now! " << mFileNameAlignParam <<" ! "<< endm; + if (mFileNameAlignParam != ""){ + LOG_INFO << " gGeoManager: Setting alignment file: " << mFileNameAlignParam << endm; + mETofGeom->setFileNameAlignParam(mFileNameAlignParam); + } + mETofGeom->init(gGeoManager); + LOG_DEBUG << " init done " << endm; + } return kStOk; } @@ -279,7 +387,9 @@ StETofHitMaker::FinishRun( Int_t runnumber ) } } - + if( mETofGeom ) { + mETofGeom->reset(); + } return kStOk; } @@ -455,7 +565,7 @@ StETofHitMaker::processMuDst() nDigisInStore++; } } - //LOG_INFO << "processMuDst() - storage is filled with " << nDigisInStore << " digis" << endm; + // LOG_INFO << "processMuDst() - storage is filled with " << nDigisInStore << " digis" << endm; matchSides(); @@ -483,7 +593,7 @@ StETofHitMaker::processMuDst() //_____________________________________________________________ -// get the start time -- from bTOF header from bTOF header for now +// get the start time -- from bTOF header for now double StETofHitMaker::startTime() { @@ -491,6 +601,13 @@ StETofHitMaker::startTime() LOG_INFO << "startTime(): -- loading start time from bTOF header" << endm; } + if(mIsSim){ + + LOG_INFO << "mIsSim = true --> startTime set to 0" << endm; + + return 0.; + } + StBTofHeader* btofHeader = nullptr; if( mEvent ) { @@ -797,30 +914,30 @@ StETofHitMaker::matchSides() std::string histNameDigisErased; for( auto kv = mStoreDigi.begin(); kv != mStoreDigi.end(); kv++ ) { - unsigned int stripIndex = kv->first; - std::vector< StETofDigi* > *digiVec = &( kv->second ); - - // timeorder digis from both sides via lambda functions of C++11 - std::sort( digiVec->begin(), digiVec->end(), [] ( StETofDigi* lhs, StETofDigi* rhs ) { - return lhs->calibTime() < rhs->calibTime(); - } + unsigned int stripIndex = kv->first; + std::vector< StETofDigi* > *digiVec = &( kv->second ); + + // timeorder digis from both sides via lambda functions of C++11 + std::sort( digiVec->begin(), digiVec->end(), [] ( StETofDigi* lhs, StETofDigi* rhs ) { + return lhs->calibTime() < rhs->calibTime(); + } ); - - int nDigisOnStrip = digiVec->size(); - //-------------------------------------------------------------------------------- - // print out for testing - if( mDebug ) { - LOG_INFO << stripIndex << " size: " << nDigisOnStrip << endm; - - for( size_t i=0; isize(); i++ ) { - LOG_INFO << "matchSides() - DIGI: " << digiVec->at( i ) << " "; - LOG_INFO << "calibTime=" << setprecision( 16 ) << digiVec->at( i )->calibTime() << " " << endm; - LOG_INFO << "calibTot=" << setprecision( 4 ) << digiVec->at( i )->calibTot() << " "; - LOG_INFO << "side=" << setprecision( 4 ) << digiVec->at( i )->side() << endm; - } - } - //-------------------------------------------------------------------------------- - + + int nDigisOnStrip = digiVec->size(); + //-------------------------------------------------------------------------------- + // print out for testing + if( mDebug ) { + LOG_INFO << stripIndex << " size: " << nDigisOnStrip << endm; + + for( size_t i=0; isize(); i++ ) { + LOG_INFO << "matchSides() - DIGI: " << digiVec->at( i ) << " "; + LOG_INFO << "calibTime=" << setprecision( 16 ) << digiVec->at( i )->calibTime() << " " << endm; + LOG_INFO << "calibTot=" << setprecision( 4 ) << digiVec->at( i )->calibTot() << " "; + LOG_INFO << "side=" << setprecision( 4 ) << digiVec->at( i )->side() << endm; + } + } + //-------------------------------------------------------------------------------- + int detIndex = stripIndex / 100; int sector = detIndex / 100; int plane = ( detIndex % 100 ) / 10; @@ -828,64 +945,40 @@ StETofHitMaker::matchSides() int strip = stripIndex % 100; if( mDoQA ) { - std::string histNameDigisPerStrip = "digisPerStrip_s" + std::to_string( sector ) + "m" + std::to_string( plane ) + "c" + std::to_string( counter ); - mHistograms.at( histNameDigisPerStrip )->Fill( strip, nDigisOnStrip ); + std::string histNameDigisPerStrip = "digisPerStrip_s" + std::to_string( sector ) + "m" + std::to_string( plane ) + "c" + std::to_string( counter ); + mHistograms.at( histNameDigisPerStrip )->Fill( strip, nDigisOnStrip ); - histNameDigisErased = "digisErased_s" + std::to_string( sector ) + "m" + std::to_string( plane ) + "c" + std::to_string( counter ); + histNameDigisErased = "digisErased_s" + std::to_string( sector ) + "m" + std::to_string( plane ) + "c" + std::to_string( counter ); } //-------------------------------------------------------------------------------- // remove digis from the vector that fall within the dead time caused by another digi on the same side of a strip std::vector< double > deadTime( 2, -60. ); -/* - for( auto it = digiVec->begin(); it != digiVec->end(); it++ ) { //TODO: move to hit candidate check!! - if( fabs( (*it)->calibTime() - deadTime.at( (*it)->side() - 1 ) ) < mSoftwareDeadTime ) { - - if( mDebug ) { - LOG_INFO << "digi within dead time --> ignore ... ( geomId : " << stripIndex * 10 + (*it)->side(); - LOG_INFO << " dead time: " << setprecision( 16 ) << deadTime.at( (*it)->side() - 1 ); - LOG_INFO << " calib time: " << setprecision( 16 ) << (*it)->calibTime(); - LOG_INFO << " difference: " << (*it)->calibTime() - deadTime.at( (*it)->side() - 1 ) << endm; - } - - delete *it; - digiVec->erase( it ); - it--; - if( mDoQA ) { - mHistograms.at( histNameDigisErased )->Fill( 1 ); - } - } - else { - deadTime.at( (*it)->side() - 1 ) = (*it)->calibTime(); - } - } - for( auto it = digiVec->begin(); it != digiVec->end(); it++ ) { - if( (*it)->rawTime() - deadTime.at( (*it)->side() - 1 ) < mSoftwareDeadTime ) { //TODO: move to DB. use raw time - + if( (*it)->rawTime() - deadTime.at( (*it)->side() - 1 ) < mSoftwareDeadTime ) { //TODO: move to DB. use raw time + if( mDebug ) { - LOG_INFO << "digi within dead time --> ignore ... ( geomId : " << stripIndex * 10 + (*it)->side(); - LOG_INFO << " dead time: " << setprecision( 16 ) << deadTime.at( (*it)->side() - 1 ); + LOG_INFO << "digi within dead time --> ignore ... ( geomId : " << stripIndex * 10 + (*it)->side(); + LOG_INFO << " dead time: " << setprecision( 16 ) << deadTime.at( (*it)->side() - 1 ); LOG_INFO << " calib time: " << setprecision( 16 ) << (*it)->calibTime(); LOG_INFO << " difference: " << (*it)->calibTime() - deadTime.at( (*it)->side() - 1 ) << endm; } - + delete *it; digiVec->erase( it ); if( mDoQA ){ - mHistograms[ histNameDigisErased ]->Fill(1); + mHistograms[ histNameDigisErased ]->Fill(1); } it--; - } - else { - deadTime.at( (*it)->side() - 1 ) = (*it)->rawTime(); - } + } + else { + deadTime.at( (*it)->side() - 1 ) = (*it)->rawTime(); + } } -*/ //-------------------------------------------------------------------------------- - + double posX = 0.0; double posY = 0.0; @@ -896,204 +989,221 @@ StETofHitMaker::matchSides() if( mDoQA && digiVec->size() == 1 ) { - mHistograms.at( histNameDigisErased )->Fill( 2 ); + mHistograms.at( histNameDigisErased )->Fill( 2 ); } - + // loop over digis on the same strip while( digiVec->size() > 1 ) { - if( mDebug ) { + if( mDebug ) { LOG_DEBUG << stripIndex << " -- digiVec->size() -- " << digiVec->size() << endm; - } - // treat consecutive digis on the same side: - // we want to have the first and second digi to be on different sides - // of the strip in order to build hits out of them - while( digiVec->at( 0 )->side() == digiVec->at( 1 )->side() ) { - - if( digiVec->size() > 2 ) { //more than 2 digis left on strip - - // test for three (or more) consecutive digis on the same side - if( digiVec->at( 2 )->side() == digiVec->at( 0 )->side() ) { - - // delete first digi - iterDigi = digiVec->begin(); - delete *iterDigi; - digiVec->erase( iterDigi ); - if( mDoQA ) { - mHistograms.at( histNameDigisErased )->Fill( 3 ); - } - } - else { // --> third digi is on the other side compared to first and second digi + } + // treat consecutive digis on the same side: + // we want to have the first and second digi to be on different sides + // of the strip in order to build hits out of them + while( digiVec->at( 0 )->side() == digiVec->at( 1 )->side() ) { + + if( digiVec->size() > 2 ) { //more than 2 digis left on strip + + // test for three (or more) consecutive digis on the same side + if( digiVec->at( 2 )->side() == digiVec->at( 0 )->side() ) { + + // delete first digi + iterDigi = digiVec->begin(); + delete *iterDigi; + digiVec->erase( iterDigi ); + if( mDoQA ) { + mHistograms.at( histNameDigisErased )->Fill( 3 ); + } + } + else { // --> third digi is on the other side compared to first and second digi if( digiVec->at( 2 )->calibTime() - digiVec->at( 0 )->calibTime() > digiVec->at( 2 )->calibTime() - digiVec->at( 1 )->calibTime() ) { - - // third digi is not same side and fits better with second digi - // --> delete first digi - iterDigi = digiVec->begin(); - delete *iterDigi; - digiVec->erase( iterDigi ); - //TODO: Afterpulse handling: save time difference between digi 1 and digi 2 and substract from hit time! - t_corr_afterpulse = digiVec->at( 0 )->calibTime() - digiVec->at( 1 )->calibTime(); //CHECK IF THAT actually makes things better!! - if( mDoQA ) { - mHistograms.at( histNameDigisErased )->Fill( 4 ); - } + + // third digi is not same side and fits better with second digi + // --> delete first digi + iterDigi = digiVec->begin(); + delete *iterDigi; + digiVec->erase( iterDigi ); + //TODO: Afterpulse handling: save time difference between digi 1 and digi 2 and substract from hit time! + t_corr_afterpulse = digiVec->at( 0 )->calibTime() - digiVec->at( 1 )->calibTime(); //CHECK IF THAT actually makes things better!! + if( mDoQA ) { + mHistograms.at( histNameDigisErased )->Fill( 4 ); + } } else { - // third digi is not same side and fits better with first digi - // --> delete second digi - iterDigi = digiVec->begin() + 1; - delete *iterDigi; - digiVec->erase( iterDigi ); - if( mDoQA ) { - mHistograms.at( histNameDigisErased )->Fill( 7 ); //TODO: Seperate in QA. Missed afterpulse side?! Should be rare - } + // third digi is not same side and fits better with first digi + // --> delete second digi + iterDigi = digiVec->begin() + 1; + delete *iterDigi; + digiVec->erase( iterDigi ); + if( mDoQA ) { + mHistograms.at( histNameDigisErased )->Fill( 7 ); //TODO: Seperate in QA. Missed afterpulse side?! Should be rare + } } - } - } - else{ // --> 2 or less digis left on the strip (on the same side of the strip) - // delete the remaining digi - iterDigi = digiVec->begin(); - delete *iterDigi; - digiVec->erase( iterDigi ); - if( mDoQA && digiVec->size() == 1 ){ - mHistograms.at( histNameDigisErased )->Fill( 5 ); - } - } - - if( digiVec->size() < 2 ) { //only one digi left on strip. break loop. - if(mDoQA && digiVec->size() == 1) { - mHistograms.at( histNameDigisErased )->Fill( 5 ); - } - break; - } - } // first and second digi in the vector are on different sides - - if( mDebug ) { - LOG_DEBUG << "matchSides() - digi processing for sector " << stripIndex / 10000; - LOG_DEBUG << " plane " << ( stripIndex % 10000 ) / 1000 << " counter " << ( stripIndex % 1000 ) / 100; - LOG_DEBUG << " strip " << stripIndex % 100; - LOG_DEBUG << " size: " << digiVec->size() << endm; - } - + } + } + else{ // --> 2 or less digis left on the strip (on the same side of the strip) + // delete the remaining digi + iterDigi = digiVec->begin(); + delete *iterDigi; + digiVec->erase( iterDigi ); + if( mDoQA && digiVec->size() == 1 ){ + mHistograms.at( histNameDigisErased )->Fill( 5 ); + } + } + + if( digiVec->size() < 2 ) { //only one digi left on strip. break loop. + if(mDoQA && digiVec->size() == 1) { + mHistograms.at( histNameDigisErased )->Fill( 5 ); + } + break; + } + } // first and second digi in the vector are on different sides + + if( mDebug ) { + LOG_DEBUG << "matchSides() - digi processing for sector " << stripIndex / 10000; + LOG_DEBUG << " plane " << ( stripIndex % 10000 ) / 1000 << " counter " << ( stripIndex % 1000 ) / 100; + LOG_DEBUG << " strip " << stripIndex % 100; + LOG_DEBUG << " size: " << digiVec->size() << endm; + } + if( digiVec->size() < 2 ) { - // only one digi left on strip. break loop. - if( mDoQA ) { - mHistograms.at( histNameDigisErased )->Fill( 5 ); + // only one digi left on strip. break loop. + if( mDoQA ) { + mHistograms.at( histNameDigisErased )->Fill( 5 ); } - break; + break; } - + // two digis --> both sides present StETofDigi* xDigiA = digiVec->at( 0 ); StETofDigi* xDigiB = digiVec->at( 1 ); - + timeDiff = xDigiA->calibTime() - xDigiB->calibTime(); - + if( mDebug ) { - LOG_DEBUG << "matchSides() - time difference in ns: " << timeDiff << endm; + LOG_DEBUG << "matchSides() - time difference in ns: " << timeDiff << endm; } // side 1 is the top, side 2 is bottom if( xDigiA->side() == 2 ) { - posY = mSigVel.at( detIndex ) * timeDiff * 0.5; + posY = mSigVel.at( detIndex ) * timeDiff * 0.5; } else { - posY = -1 * mSigVel.at( detIndex ) * timeDiff * 0.5; + posY = -1 * mSigVel.at( detIndex ) * timeDiff * 0.5; } - - + + // check for a better match if the local y position is outside the detector bounds if( fabs( posY ) > mMaxYPos && digiVec->size() > 2 ) { - if( mDebug ) { - LOG_DEBUG << "matchSides() - hit candidate outside correlation window, check for better possible digis" << endm; - LOG_DEBUG << "size of digi vector: " << digiVec->size() << endm; - } - - StETofDigi* xDigiC = digiVec->at( 2 ); + if( mDebug ) { + LOG_DEBUG << "matchSides() - hit candidate outside correlation window, check for better possible digis" << endm; + LOG_DEBUG << "size of digi vector: " << digiVec->size() << endm; + } + + StETofDigi* xDigiC = digiVec->at( 2 ); - double posYNew = 0.; - double timeDiffNew = 0.; - - if( xDigiC->side() == xDigiA->side() ) { + double posYNew = 0.; + double timeDiffNew = 0.; + + if( xDigiC->side() == xDigiA->side() ) { timeDiffNew = xDigiC->calibTime() - xDigiB->calibTime(); + } + else { + timeDiffNew = xDigiA->calibTime() - xDigiC->calibTime(); + } + + if( xDigiA->side() == 2 ) { + posYNew = mSigVel.at( detIndex ) * timeDiffNew * 0.5; } - else { - timeDiffNew = xDigiA->calibTime() - xDigiC->calibTime(); - } - - if( xDigiA->side() == 2 ) { - posYNew = mSigVel.at( detIndex ) * timeDiffNew * 0.5; - } - else { - posYNew = -1 * mSigVel.at( detIndex ) * timeDiffNew * 0.5; - } - + else { + posYNew = -1 * mSigVel.at( detIndex ) * timeDiffNew * 0.5; + } + if( fabs( posYNew ) < fabs( posY ) ) { - if( mDebug ) { - LOG_DEBUG << "matchSides() - found better match for hit candidate -> changing out digis" << endm; - } - - timeDiff = timeDiffNew; - posY = posYNew; - - if( xDigiC->side() == xDigiA->side() ) { + if( mDebug ) { + LOG_DEBUG << "matchSides() - found better match for hit candidate -> changing out digis" << endm; + } + + timeDiff = timeDiffNew; + posY = posYNew; + + if( xDigiC->side() == xDigiA->side() ) { //TODO: Afterpulse handling: save time difference between digi 1 and digi 2 and substract from hit time! - t_corr_afterpulse = xDigiA->calibTime() - xDigiC->calibTime(); //CHECK IF THAT actually makes things better!! - xDigiA = xDigiC; - iterDigi = digiVec->begin(); - delete *iterDigi; - digiVec->erase( iterDigi ); - if( mDoQA ){ - mHistograms.at( histNameDigisErased )->Fill( 4 ); - } - } - else { - //TODO: Afterpulse handling: save time difference between digi 1 and digi 2 and substract from hit time! - t_corr_afterpulse = xDigiB->calibTime() - xDigiC->calibTime(); //CHECK IF THAT actually makes things better!! - xDigiB = xDigiC; - iterDigi = digiVec->begin() + 1; - delete *iterDigi; - digiVec->erase( iterDigi ); - if( mDoQA ){ - mHistograms.at( histNameDigisErased )->Fill( 4 ); - } - } + t_corr_afterpulse = xDigiA->calibTime() - xDigiC->calibTime(); //CHECK IF THAT actually makes things better!! + xDigiA = xDigiC; + iterDigi = digiVec->begin(); + delete *iterDigi; + digiVec->erase( iterDigi ); + if( mDoQA ){ + mHistograms.at( histNameDigisErased )->Fill( 4 ); + } + } + else { + //TODO: Afterpulse handling: save time difference between digi 1 and digi 2 and substract from hit time! + t_corr_afterpulse = xDigiB->calibTime() - xDigiC->calibTime(); //CHECK IF THAT actually makes things better!! + xDigiB = xDigiC; + iterDigi = digiVec->begin() + 1; + delete *iterDigi; + digiVec->erase( iterDigi ); + if( mDoQA ){ + mHistograms.at( histNameDigisErased )->Fill( 4 ); + } + } } else { // --> keeps candidate even if it is outside correlation window - if( mDebug ) { - LOG_DEBUG << "matchSides() - no better match -> keep this hit candidate" << endm; - } + if( mDebug ) { + LOG_DEBUG << "matchSides() - no better match -> keep this hit candidate" << endm; + } } } // check for better match with third digi done - - + + if( xDigiA->side() == xDigiB->side() ) { - LOG_ERROR << "matchSides() - wrong combinations of digis:" << endm; - LOG_ERROR << *xDigiA << endm; - LOG_ERROR << *xDigiB << endm; + LOG_ERROR << "matchSides() - wrong combinations of digis:" << endm; + LOG_ERROR << *xDigiA << endm; + LOG_ERROR << *xDigiB << endm; } - - - + + + // create the hit candidate: // the "strip" time is the mean time between each end time = 0.5 * ( xDigiA->calibTime() + xDigiB->calibTime() ); //TODO: Afterpulse handling: correct hit time by the time difference between the first and second digi on the same side - time += t_corr_afterpulse; - + if(!mIsSim){//merge skip corrections for simulation + time += t_corr_afterpulse; + } // weight of merging of hits (later) is the total charge => sum of both ends ToT totSum = xDigiA->calibTot() + xDigiB->calibTot(); // use local coordinates... (0,0,0) is in the center of counter posX = ( -1 * eTofConst::nStrips / 2. + strip - 0.5 ) * eTofConst::stripPitch; - - - + // check if the hit position (and hence time) is likely wrong due to a clock jumps in one of the Get4s bool hasClockJump = false; if( fabs( posY ) > 0.5 * ( eTofConst::coarseClockCycle * mSigVel.at( detIndex ) - eTofConst::stripLength ) * 0.9 ) { hasClockJump = true; } + + //check for position jumps -> get clock jumps + bool leftjump = false; + bool outsider = false; + double dt = 0; + + if(xDigiA->side() == 2 ){ + dt = xDigiA->calibTime() - xDigiB->calibTime(); + }else{ + dt = xDigiB->calibTime() - xDigiA->calibTime(); + } + if(abs(dt)> 8.5 ){ + outsider = true; + } + if(dt < 8.5 && dt > 0){ + leftjump = true; + } + //--------------------------------------------------------- // correct for single side clock jumps. Sync signal recovers time jumps, so no double jumps *should* occur // it seems more likely that one Get4 misses one clock pulse and is 6.25ns behind, however jumps in both directions seem to be seen in the data @@ -1108,39 +1218,106 @@ StETofHitMaker::matchSides() time -= eTofConst::coarseClockCycle * 0.5 * mClockJumpDirection.at( detIndex * 10 + ( strip - 1 ) / 4 + 1 ); timeDiff -= eTofConst::coarseClockCycle * ( ( timeDiff < 0 ) ? -1 : ( timeDiff > 0 ) ); + if(leftjump && mDoDoubleClockJumpShift){ + time += 2*(eTofConst::coarseClockCycle * 0.5 * mClockJumpDirection.at( detIndex * 10 + ( strip - 1 ) / 4 + 1 )); + } + + // shift "uncorrectable" (improper RbR offsets, doublejumps, missmatches etc. ) hits far off in time and position to be sorted out later + if(outsider && mDoDoubleClockJumpShift){ + time += 100*(eTofConst::coarseClockCycle * 0.5 * mClockJumpDirection.at( detIndex * 10 + ( strip - 1 ) / 4 + 1 )); + timeDiff -= 100*(eTofConst::coarseClockCycle * ( ( timeDiff < 0 ) ? -1 : ( timeDiff > 0 ) )) + 2.0; + } + if( mDoQA ) { - LOG_INFO << "shifted hit on: " << sector << "-" << plane << "-" << counter << " -- " << strip << " Direction " << mClockJumpDirection.at( detIndex * 10 + ( strip - 1 ) / 4 + 1 ) << endm; + LOG_INFO << "shifted hit on: " << sector << "-" << plane << "-" << counter << " -- " << strip << " Direction " << mClockJumpDirection.at( detIndex * 10 + ( strip - 1 ) / 4 + 1 ) << endm; } - + if( xDigiA->side() == 2 ) { // recalculate Y-Position based on new time. posY = mSigVel.at( detIndex ) * timeDiff * 0.5; } else { - posY = -1 * mSigVel.at( detIndex ) * timeDiff * 0.5; + posY = -1 * mSigVel.at( detIndex ) * timeDiff * 0.5; } } - if( mDebug ) { - LOG_DEBUG << "detIndex=" << detIndex << "posX=" << posX << " posY=" << posY << " time= " << time << " totSum=" << totSum << endm; + LOG_DEBUG << "detIndex=" << detIndex << "posX=" << posX << " posY=" << posY << " time= " << time << " totSum=" << totSum << endm; } // build a hit (clustersize is one strip at this point) unsigned int clusterSize = 1; if( hasClockJump ) { - // add 100 to the cluster size to identify jumped hits in the matchMaker - clusterSize += 100; + // add 100 to the cluster size to identify jumped hits in the matchMaker + clusterSize += 100; } StETofHit* constructedHit = new StETofHit( sector, plane, counter, time, totSum, clusterSize, posX, posY ); + //Modify individual counters if needed (e.g. flip in local y due to switched cables) + if(mModMatrix.at(detIndex) > 0){ + int mode = mModMatrix.at(detIndex); + modifyHit(mode, posX , posY , time); + } + + + //Check for "same direction double clockjumps" and update FlagMap + if(mDoDoubleClockJumpShift){ + double starttime = startTime(); + + if( starttime > 0){ + + double tof = fmod( constructedHit->time() , eTofConst::bTofClockCycle ) - starttime; + double exptof = 0; + + if(mETofGeom){ + + StMuPrimaryVertex* pVtx = mMuDst->primaryVertex( 0 ); + StThreeVectorD posGlo = mETofGeom->hitLocal2Master( constructedHit ); + + if( pVtx ) { + StThreeVectorF vtxPos = pVtx->position(); + exptof = tofPathLength(&vtxPos , &posGlo , 0) / ( nanosecond * c_light ); + } + } + + int get4Nr = detIndex * 10 + ( strip - 1 ) / 4 + 1; + + double tMin = mGet4doublejumpTmin; + double t1 = mGet4doublejumpTimes.at(get4Nr).at(0); + double t2 = mGet4doublejumpTimes.at(get4Nr).at(1); + + mGet4doublejumpTimes.at(get4Nr).erase(mGet4doublejumpTimes.at(get4Nr).begin()); + mGet4doublejumpTimes.at(get4Nr).push_back(tof - exptof); + if(mGet4doublejumpTimes.at(get4Nr).size() > 2 ){ + mGet4doublejumpTimes.at(get4Nr).erase(mGet4doublejumpTimes.at(get4Nr).begin()); + } + + t1 = mGet4doublejumpTimes.at(get4Nr).at(0); + t2 = mGet4doublejumpTimes.at(get4Nr).at(1); + + if(t2 < tMin && t1 < tMin && t2 > -999 && t1 > -999){ + mGet4doublejumpFlag.at(get4Nr) = 1; + } + + if(t2 > tMin && t1 > tMin ){ + mGet4doublejumpFlag.at(get4Nr) = 0; + } + + if(mGet4doublejumpFlag.at(get4Nr) == 1){ + constructedHit->setTime(constructedHit->time() + eTofConst::coarseClockCycle); + constructedHit->setClusterSize(constructedHit->clusterSize() + 200); + tof += eTofConst::coarseClockCycle; + } + } + } + // push hit into intermediate collection mStoreHit[ detIndex ].push_back( constructedHit ); - + // fill pointer vector std::vector< unsigned int > containedDigiIndices; - + containedDigiIndices.push_back( mMapDigiIndex.at( xDigiA ) ); containedDigiIndices.push_back( mMapDigiIndex.at( xDigiB ) ); @@ -1149,7 +1326,15 @@ StETofHitMaker::matchSides() //reset afterpulse time correction! t_corr_afterpulse = 0.0; + // pass IdTruth to hit + if(mIsSim){ + int DigiIdA = xDigiA->rawTot(); + int DigiIdB = xDigiB->rawTot(); + if(DigiIdB==DigiIdA){constructedHit->setIdTruth(DigiIdA);} + else{constructedHit->setIdTruth(9999);} + } + LOG_DEBUG << *( mStoreHit.at( detIndex ).back() ) << endm; // erase the two used digis! @@ -1362,6 +1547,9 @@ StETofHitMaker::mergeClusters( const bool isMuDst ) LOG_DEBUG << "mergeClusters() - checking hit vector for possible hits to merge with..." << endm; } + bool isMissmatch = false; + int idTruth = 0; + StETofHit* pHit = hitVec->at( 0 ); // scale with tot for weigthed average @@ -1467,6 +1655,19 @@ StETofHitMaker::mergeClusters( const bool isMuDst ) } + // merge IdTruth information + if(mIsSim){ + + if(pMergeHit->idTruth() !=pHit->idTruth()){ + idTruth = -99999; + isMissmatch = 1; + } + else if(!isMissmatch){ + idTruth = pHit->idTruth(); + } + } + + // erase the hit that was merged iterHit = hitVec->begin() + index; delete *iterHit; @@ -1488,7 +1689,13 @@ StETofHitMaker::mergeClusters( const bool isMuDst ) } // end of loop over hits for merging - + // set idTruth if nothing to merge + if(mIsSim){ + if(idTruth == 0){ + idTruth = pHit->idTruth(); + } + } + // renormalize with the total ToT weightedTime /= weightsTotSum; weightedPosX /= weightsTotSum; @@ -1514,7 +1721,12 @@ StETofHitMaker::mergeClusters( const bool isMuDst ) // create combined hit StETofHit* combinedHit = new StETofHit( sector, plane, counter, weightedTime, weightsTotSum, clusterSize, weightedPosX, weightedPosY ); + + if(mIsSim){ + combinedHit->setIdTruth(idTruth); + } + // fill hit into the eTOF collection or the eTOf hit array depending on StEvent or MuDst input if( !isMuDst ) { mEvent->etofCollection()->addHit( combinedHit ); @@ -1661,7 +1873,7 @@ StETofHitMaker::fillHitQA( const bool isMuDst, const double& tstart ) } // if tstart exists - if( fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001 ) { + if( (fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001) || mIsSim ) { double tof = aHit->time() - tstart; if( tof < -800 ) { tof += eTofConst::bTofClockCycle; @@ -1707,7 +1919,7 @@ StETofHitMaker::fillHitQA( const bool isMuDst, const double& tstart ) updateCyclicRunningMean( aHit->leadingEdgeTime(), averageBTofHitTime, nHitsBTof, eTofConst::bTofClockCycle ); // if doQA && tstart exists - if( mDoQA && fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001 ) { + if( mDoQA && ((fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001) || mIsSim) ) { double tof = aHit->leadingEdgeTime() - tstart; if( tof < 0 ) { tof += eTofConst::bTofClockCycle; @@ -1805,7 +2017,7 @@ StETofHitMaker::fillHitQA( const bool isMuDst, const double& tstart ) } // if tstart exists - if( fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001 ) { + if( (fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001) || mIsSim ) { double tof = aHit->time() - tstart; if( tof < -800 ) { tof += eTofConst::bTofClockCycle; @@ -1847,7 +2059,7 @@ StETofHitMaker::fillHitQA( const bool isMuDst, const double& tstart ) updateCyclicRunningMean( aHit->leadingEdgeTime(), averageBTofHitTime, nHitsBTof, eTofConst::bTofClockCycle ); // if doQA && tstart exists - if( mDoQA && fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001 ) { + if( mDoQA && ((fabs( tstart ) > 0.001 && fabs( tstart - ( eTofConst::bTofClockCycle - 9999. ) ) > 0.001) || mIsSim) ) { double tof = aHit->leadingEdgeTime() - tstart; if( tof < -800 ) { tof += eTofConst::bTofClockCycle; @@ -2144,3 +2356,41 @@ StETofHitMaker::updateClockJumpMap( const std::map< int, int >& clockJumpDir ) } } } + +//_____________________________________________________________ + +void +StETofHitMaker::modifyHit( int modMode, double& localX,double& localY, double& time ) +{ + switch (modMode) { + + case 0: + return; + + case 1: + localX *= -1; + localY *= -1; + break; + + case 2: + localX *= -1; + break; + + case 3: + localY *= -1; + break; + + case 4: + std::swap(localX, localY), localY = -localY; + break; + + case 5: + std::swap(localX, localY), localX = -localX; + break; + + case 99: + localX = 9999; + localY = 9999; + break; + } +} diff --git a/StRoot/StETofHitMaker/StETofHitMaker.h b/StRoot/StETofHitMaker/StETofHitMaker.h index 3c3789fc3d7..9e82f1e2ed0 100644 --- a/StRoot/StETofHitMaker/StETofHitMaker.h +++ b/StRoot/StETofHitMaker/StETofHitMaker.h @@ -41,6 +41,7 @@ #include #include "StMaker.h" +#include "StThreeVectorD.hh" class TH1; @@ -53,6 +54,8 @@ class StMuETofDigi; class StETofHit; class StMuETofHit; +class StETofGeometry; + class StETofHitMaker: public StMaker { public: @@ -74,15 +77,22 @@ class StETofHitMaker: public StMaker { /// read hit building parameters from file void setFileNameHitParam( const char* fileName ); void setFileNameSignalVelocity( const char* fileName ); + void setFileNameModMatrix( const char* fileName ); + void setFileNameAlignParam( const char* fileName ); + void setGet4MinTime( const double minTime ); void setSoftwareDeadTime( const double& deadTime ); void setDoClockJumpShift( const bool doShift ); - + void setDoDoubleClockJumpShift( const bool doDoubleShift ); + + void setIsSim( const bool isSim ); // for simulated digis void setDoQA( const bool doQA ); void setDebug( const bool debug ); void updateClockJumpMap( const std::map< int, int >& clockJumpDir ); + void modifyHit(int modMode, double& localX, double& localY, double& time); + private: // internal subfunctions ---------------------------------------------------------------------- void bookHistograms(); @@ -114,10 +124,14 @@ class StETofHitMaker: public StMaker { // internal containers ------------------------------------------------------------------------ StEvent* mEvent; StMuDst* mMuDst; + StETofGeometry* mETofGeom; // pointer to the ETof geometry utility class + std::string mFileNameHitParam; // name of parameter file for hit parameters std::string mFileNameSignalVelocity; // name of parameter file for signal velocity - + std::string mFileNameModMatrix; // name of parameter file for hit modification on counter level + std::string mFileNameAlignParam; // name of parameter file for counter alignment in geometry + // store digis ordered by detectorstrip for side-matching std::map< UInt_t, std::vector< StETofDigi* > > mStoreDigi; // key: strip index, value: vector of digis @@ -139,12 +153,21 @@ class StETofHitMaker: public StMaker { std::map< UInt_t, Double_t > mSigVel; // signal velocities in each detector - Double_t mSoftwareDeadTime; // dead time introduced in software to reject after pulses on the same channel - Bool_t mDoClockJumpShift; // correct for clock jumps on one side + Double_t mSoftwareDeadTime; // dead time introduced in software to reject after pulses on the same channel + Bool_t mDoClockJumpShift; // correct for clock jumps on one side + Bool_t mDoDoubleClockJumpShift; // correct for clock jumps on both sides std::map< Int_t, Int_t > mClockJumpDirection; // stores direction of clock jump for time correction + std::map< Int_t, int > mModMatrix; // stores mode of modification for hits on striplevel (flip) + + float mGet4doublejumpTmin; // cutoff for double jump correction + std::map< Int_t, bool > mGet4doublejumpFlag; // get4 jumpflag + std::map< Int_t, std::vector < float > > mGet4doublejumpTimes; // get4 time of last n hits + + // histograms for QA -------------------------------------------------------- + Bool_t mIsSim; Bool_t mDoQA; Bool_t mDebug; @@ -161,11 +184,17 @@ class StETofHitMaker: public StMaker { inline void StETofHitMaker::setFileNameHitParam( const char* fileName ) { mFileNameHitParam = fileName; } inline void StETofHitMaker::setFileNameSignalVelocity( const char* fileName ) { mFileNameSignalVelocity = fileName; } +inline void StETofHitMaker::setFileNameModMatrix( const char* fileName ) { mFileNameModMatrix = fileName; } +inline void StETofHitMaker::setFileNameAlignParam( const char* fileName ) { mFileNameAlignParam = fileName; } + +inline void StETofHitMaker::setGet4MinTime( const double minTime ) { mGet4doublejumpTmin = minTime; } inline void StETofHitMaker::setSoftwareDeadTime( const double& deadTime ) { mSoftwareDeadTime = deadTime; } inline void StETofHitMaker::setDoClockJumpShift( const bool doShift ) { mDoClockJumpShift = doShift; } +inline void StETofHitMaker::setDoDoubleClockJumpShift( const bool doDoubleShift ) { mDoDoubleClockJumpShift = doDoubleShift; } +inline void StETofHitMaker::setIsSim( const bool isSim ) { mIsSim = isSim; } inline void StETofHitMaker::setDoQA( const bool doQA ) { mDoQA = doQA; } inline void StETofHitMaker::setDebug( const bool debug ) { mDebug = debug; } -#endif \ No newline at end of file +#endif diff --git a/StRoot/StETofMatchMaker/StETofMatchMaker.cxx b/StRoot/StETofMatchMaker/StETofMatchMaker.cxx index 953fdbb60fe..7f6e1c47eb1 100644 --- a/StRoot/StETofMatchMaker/StETofMatchMaker.cxx +++ b/StRoot/StETofMatchMaker/StETofMatchMaker.cxx @@ -88,6 +88,7 @@ #include "StMuDSTMaker/COMMON/StMuETofDigi.h" #include "StETofMatchMaker.h" +#include "StETofHitMaker/StETofHitMaker.h" #include "StETofUtil/StETofGeometry.h" #include "StETofUtil/StETofConstants.h" @@ -138,6 +139,7 @@ StETofMatchMaker::StETofMatchMaker( const char* name ) mMuDst( nullptr ), mETofGeom( nullptr ), mFileNameMatchParam( "" ), + mFileNameAlignParam( "" ), mIsStEventIn( false ), mIsMuDstIn( false ), mOuterTrackGeometry( true ), @@ -149,24 +151,23 @@ StETofMatchMaker::StETofMatchMaker( const char* name ) mMatchDistX( 5. ), mMatchDistY( 10. ), mMatchDistT( 99999. ), + mT0corrVec(), mT0corr( 0. ), mT0switch( 0 ), mNupdatesT0( 0 ), + mIndex2Primary(), mMatchRadius( 0. ), - mHistFileName( "" ) + mLocalYmax(16.), + mClockJumpCand(), + mClockJumpDirection(), + mHistFileName( "" ), + mHistograms(), + mHistograms2d() { - mT0corrVec.clear(); mT0corrVec.reserve( 500 ); - - - mIndex2Primary.clear(); - mTrackCuts.push_back( 0. ); // nHitsFit mTrackCuts.push_back( 0. ); // nHitsRatio mTrackCuts.push_back( 0. ); // low pt - - mHistograms.clear(); - mHistograms2d.clear(); } @@ -287,6 +288,11 @@ StETofMatchMaker::InitRun( Int_t runnumber ) LOG_DEBUG << " gGeoManager: " << gGeoManager << endm; + if (mFileNameAlignParam != ""){ + LOG_DEBUG << " gGeoManager: Setting alignment file: " << mFileNameAlignParam << endm; + mETofGeom->setFileNameAlignParam(mFileNameAlignParam); + } + mETofGeom->init( gGeoManager, etofProjection::safetyMargins, mUseHelixSwimmer ); //provide backline to initiating maker to load DB tables } @@ -295,6 +301,14 @@ StETofMatchMaker::InitRun( Int_t runnumber ) return kStFatal; } + + // -------------------------------------------------------------------------------------------- + // pointer to eTOF hit maker + // -------------------------------------------------------------------------------------------- + + mETofHitMaker = ( StETofHitMaker* ) GetMaker( "etofHit" ); + LOG_DEBUG << "StETofMatchMaker::InitRun() -- pointer to eTOF hit maker: " << mETofHitMaker << endm; + if( mDoQA ) { // for geometry debugging for( unsigned int i=0; inValidModules(); i++ ) { @@ -471,7 +485,7 @@ StETofMatchMaker::Make() } mHistograms.at( "intersectionMult_etofMult" )->Fill( detectorHitVec.size(), intersectionVec.size() ); - + //......................................................................... // C. match detector hits to track intersections // @@ -484,7 +498,7 @@ StETofMatchMaker::Make() return kStOk; } - + //......................................................................... // D. sort matchCand vector and deal with (discard) hits matched by multiple tracks // @@ -499,7 +513,7 @@ StETofMatchMaker::Make() return kStOk; } - + //......................................................................... // E. sort singleTrackMatchVector for multiple hits associated to single tracks and determine the best match // @@ -515,7 +529,7 @@ StETofMatchMaker::Make() else{ //LOG_INFO << "Make() -- number of found matches of eTOF hits with tracks: " << finalMatchVec.size() << endm; } - + //......................................................................... // F. fill ETofPidTraits for global and primary tracks and assign associated track to hits // @@ -534,10 +548,11 @@ StETofMatchMaker::Make() // H. fill QA histograms // fillQaHistograms( finalMatchVec ); - + fillSlewHistograms( finalMatchVec ); - - + + checkClockJumps(); + //LOG_INFO << "Make() -- event done ... bye-bye" << endm; return kStOk; @@ -765,6 +780,10 @@ StETofMatchMaker::readETofDetectorHits( eTofHitVec& detectorHitVec ) continue; } + if( fabs(aHit->localY()) > mLocalYmax ) {//reject unphysical hits outside of detector surface from mismatches PW + continue; + } + StructETofHit detectorHit; detectorHit.sector = aHit->sector(); @@ -795,6 +814,10 @@ StETofMatchMaker::readETofDetectorHits( eTofHitVec& detectorHitVec ) continue; } + if( fabs(aHit->localY()) > mLocalYmax ) {//reject unphysical hits outside of detector surface from mismatches PW + continue; + } + StructETofHit detectorHit; detectorHit.sector = aHit->sector(); @@ -2509,6 +2532,18 @@ StETofMatchMaker::fillQaHistograms( eTofHitVec& finalMatchVec ) std::string histName_t0corr_strip = "matchCand_t0corr_strip_s" + std::to_string( matchCand.sector ) + "m" + std::to_string( matchCand.plane ) + "c" + std::to_string( matchCand.counter ); mHistograms.at( histName_t0corr_strip )->Fill( matchCand.localX, tof - tofpi ); } + + if( nSigmaPion < 2. ) { + if( matchCand.clusterSize >= 100 ) { + // hits with clock jump based on local Y position + std::string histName_t0corr_jump = "matchCand_t0corr_jump_s" + std::to_string( matchCand.sector ) + "m" + std::to_string( matchCand.plane ) + "c" + std::to_string( matchCand.counter ); + mHistograms.at( histName_t0corr_jump )->Fill( matchCand.localX, tof - tofpi ); //cutdownYS + + int get4Index = matchCand.sector * 1000 + matchCand.plane * 100 + matchCand.counter * 10 + ( matchCand.localX + 16 ) / 4 + 1; + mClockJumpCand[ get4Index ]++; + } + } + if( sqrt( pow( matchCand.deltaX, 2 ) + pow( matchCand.deltaY, 2 ) ) < etofProjection::deltaRcut ) { @@ -2700,6 +2735,13 @@ StETofMatchMaker::bookHistograms() // eta vs. phi per counter mHistograms[ histName_hit_eta_phi ] = new TH2F( Form( "A_eTofHits_phi_eta_s%dm%dc%d", sector, plane, counter ), Form( "eta vs. phi sector %d module %d counter %d; #phi; #eta", sector, plane, counter ), 200, 0., 2 * M_PI, 200, -1.7, -0.9 ); + + + std::string histName_t0corr_jump = "matchCand_t0corr_jump_s" + std::to_string( sector ) + "m" + std::to_string( plane ) + "c" + std::to_string( counter ); + mHistograms[ histName_t0corr_jump ] = new TH2F( Form( "H_matchCand_t0corr_jump_s%dm%dc%d", sector, plane, counter ), Form( "measured tof - tof_{#pi} vs. momentum in sector %d module %d counter %d;localX (cm) grouped by Get4;#Delta time (ns)", sector, plane, counter ), 8, -16., 16., 80, -20., 20. ); + + + } } } @@ -2854,7 +2896,7 @@ StETofMatchMaker::bookHistograms() // ---------- // step - H - // ---------- - mHistograms[ "matchCand_beta_mom" ] = new TH2F( "H_matchCand_beta_mom" , "match candidate 1/beta vs. momentum;p (GeV/c);1/#beta", 400, 0., 10., 1000, 0.8, 2. ); + mHistograms[ "matchCand_beta_mom" ] = new TH2F( "H_matchCand_beta_mom" , "match candidate 1/beta vs. momentum;p (GeV/c);1/#beta", 400, 0., 10., 1000, 0.0, 2. ); mHistograms[ "matchCand_beta_mom_matchDistCut" ] = new TH2F( "H_matchCand_beta_mom_matchDistCut" , "match candidate 1/beta vs. momentum;p (GeV/c);1/#beta", 400, 0., 10., 1000, 0.8, 2. ); @@ -2872,7 +2914,7 @@ StETofMatchMaker::bookHistograms() for( int counter = eTofConst::counterStart; counter <= eTofConst::counterStop; counter++ ) { std::string histName_beta_mom = "matchCand_beta_mom_s" + std::to_string( sector ) + "m" + std::to_string( plane ) + "c" + std::to_string( counter ); - mHistograms[ histName_beta_mom ] = new TH2F( Form( "H_matchCand_beta_mom_s%dm%dc%d", sector, plane, counter ), Form( "match candidate 1/beta vs. momentum in sector %d module %d counter %d;p (GeV/c);1/#beta", sector, plane, counter), 200, 0., 10., 500, 0.8, 2. ); + mHistograms[ histName_beta_mom ] = new TH2F( Form( "H_matchCand_beta_mom_s%dm%dc%d", sector, plane, counter ), Form( "match candidate 1/beta vs. momentum in sector %d module %d counter %d;p (GeV/c);1/#beta", sector, plane, counter), 200, 0., 10., 500, 0.0, 2. ); std::string histName_t0corr_mom = "matchCand_t0corr_mom_s" + std::to_string( sector ) + "m" + std::to_string( plane ) + "c" + std::to_string( counter ); mHistograms[ histName_t0corr_mom ] = new TH2F( Form( "H_matchCand_t0corr_mom_s%dm%dc%d", sector, plane, counter ), Form( "measured tof - tof_{#pi} vs. momentum in sector %d module %d counter %d;mom (GeV/c);#Delta time (ns)", sector, plane, counter ), 400, 0., 10., 1000, -500., 500. ); @@ -3016,3 +3058,65 @@ ETofTrack::ETofTrack( const StMuTrack* mutrack ) if ( phi < 0. ) phi += 2. * M_PI; } } + +//--------------------------------------------------------------------------- +void StETofMatchMaker::checkClockJumps() +{ + if (mClockJumpCand.size() == 0) return; + + // histogram filled with all hits including clock jump candidates. + int binmax = mHistograms.at("matchCand_t0corr_1d")->GetMaximumBin(); + float mainPeakT0 = mHistograms.at("matchCand_t0corr_1d")->GetXaxis()->GetBinCenter(binmax); + + LOG_DEBUG << "mainPeakT0: " << mainPeakT0 << endm; + + bool needsUpdate = false; + + for (const auto& kv : mClockJumpCand) { + LOG_DEBUG << "clock jump candidate: " << kv.first << " " << kv.second << endm; + + int sector = kv.first / 1000; + int plane = (kv.first % 1000) / 100; + int counter = (kv.first % 100) / 10; + int binX = kv.first % 10; + + std::string histName_t0corr_jump = "matchCand_t0corr_jump_s" + std::to_string(sector) + "m" + std::to_string(plane) + "c" + std::to_string(counter); + TH2D* h = (TH2D*) mHistograms.at(histName_t0corr_jump); + + int binYmain_neg = h->GetYaxis()->FindBin(mainPeakT0 - 1.5); + int binYmain_pos = h->GetYaxis()->FindBin(mainPeakT0 + 3.0); + int binYearly_neg = h->GetYaxis()->FindBin(mainPeakT0 - 1.5 - eTofConst::coarseClockCycle); + int binYearly_pos = h->GetYaxis()->FindBin(mainPeakT0 + 3.0 - eTofConst::coarseClockCycle); + int binYlate_neg = h->GetYaxis()->FindBin(mainPeakT0 - 1.5 + eTofConst::coarseClockCycle); // tight cut to reduce interference with slow particles of the main band + int binYlate_pos = h->GetYaxis()->FindBin(mainPeakT0 + 3.0 + eTofConst::coarseClockCycle); + + LOG_DEBUG << "binYmain_neg " << binYmain_neg << " " << binYmain_pos << " binYmain_pos " << binYearly_neg << " binYearly_neg " << binYearly_pos << " binYearly_pos " << endm; + + int nMain = h->Integral(binX, binX, binYmain_neg, binYmain_pos); + int nEarly = h->Integral(binX, binX, binYearly_neg, binYearly_pos); + int nLate = h->Integral(binX, binX, binYlate_neg, binYlate_pos); + + LOG_DEBUG << "nMain " << nMain << " " << nEarly << " nEarly " << endm; + + if (nEarly > nMain && nEarly >= 2) { // first two clock jumped hits in one Get4 IN EACH FILE are not are not detected. Could be changed by changing default direction of jumps, but then wrongly corrected clock jumps are LATE! Cut on late hits being above 1.5 GeV or Pion dEdX could help separate late hits from slow particles. + LOG_DEBUG << "clock jump detected --> give it to hit maker" << endm; + + mClockJumpDirection[ kv.first ] = -1.; + needsUpdate = true; + } + + if (nLate > nMain && nLate >= 2) { //allows to change default to correct backwards in time, as it is electronically most likely. Unlikely to find real proton at wrong position, but correct time. + LOG_DEBUG << "clock jump detected --> give it to hit maker" << endm; + + mClockJumpDirection[ kv.first ] = 1.; + needsUpdate = true; + } + } + + mClockJumpCand.clear(); + + // if there was a new entry to the map --> push it to the hit maker (if available) + if( needsUpdate && mETofHitMaker ) { + mETofHitMaker->updateClockJumpMap( mClockJumpDirection ); + } +} diff --git a/StRoot/StETofMatchMaker/StETofMatchMaker.h b/StRoot/StETofMatchMaker/StETofMatchMaker.h index 7fd81f6f045..2d22ddc25d3 100644 --- a/StRoot/StETofMatchMaker/StETofMatchMaker.h +++ b/StRoot/StETofMatchMaker/StETofMatchMaker.h @@ -49,6 +49,7 @@ class StETofGeometry; class StTrack; class StMuTrack; class StTrackGeometry; +class StETofHitMaker; class TH1; class TH2; @@ -117,7 +118,8 @@ class StETofMatchMaker : public StMaker { /// read matching parameters from file void setFileNameMatchParam( const char* fileName ); - + void setFileNameAlignParam( const char* fileName ); + void setOuterGeometry( const bool outerGeom ); void setUseHelixSwimmer( const bool useSwimmer ); void setUseOnlyBTofHeaderStartTime( const bool useBTofT0 ); @@ -131,6 +133,8 @@ class StETofMatchMaker : public StMaker { void setMatchDistXYT( const double x, const double y, const double t ); + void setYmax( const double ymax ); + private: @@ -165,6 +169,7 @@ class StETofMatchMaker : public StMaker { double timeOfFlight( const double& startTime, const double& stopTime ); double expectedTimeOfFlight( const double& pathLength, const double& momentum, const double& mass ); + void checkClockJumps(); void fillQaHistograms( eTofHitVec& finalMatchVec ); void fillSlewHistograms( eTofHitVec& finalMatchVec ); void bookHistograms(); @@ -180,9 +185,11 @@ class StETofMatchMaker : public StMaker { StEvent* mEvent; StMuDst* mMuDst; StETofGeometry* mETofGeom; // pointer to the ETof geometry utility class - + StETofHitMaker* mETofHitMaker; // pointer to the HitMaker to pass over correction for clock jumps + std::string mFileNameMatchParam; // name of parameter file for matching parameters - + std::string mFileNameAlignParam; + Bool_t mIsStEventIn; Bool_t mIsMuDstIn; @@ -206,8 +213,12 @@ class StETofMatchMaker : public StMaker { std::map< Int_t, Int_t > mIndex2Primary; Double_t mMatchRadius; + double mLocalYmax; std::vector< Double_t > mTrackCuts; + std::map< Int_t, Int_t > mClockJumpCand; + std::map< Int_t, Int_t > mClockJumpDirection; + std::string mHistFileName; std::map< std::string, TH1* > mHistograms; std::map< std::string, TH2* > mHistograms2d; @@ -229,7 +240,8 @@ inline void StETofMatchMaker::setNupdatesT0( const int nUpdatesT0 ) { mNupdat inline void StETofMatchMaker::setIsSim( const bool isSim ) { mIsSim = isSim; } inline void StETofMatchMaker::setDoQA( const bool doQA ) { mDoQA = doQA; } inline void StETofMatchMaker::setDebug( const bool debug ) { mDebug = debug; } +inline void StETofMatchMaker::setYmax( const double ymax ) { mLocalYmax = ymax; } inline StETofGeometry* StETofMatchMaker::etofGeometry() const { return mETofGeom; } -#endif \ No newline at end of file +#endif diff --git a/StRoot/StETofUtil/StETofGeometry.cxx b/StRoot/StETofUtil/StETofGeometry.cxx index 4743e924eeb..9affd56b19f 100644 --- a/StRoot/StETofUtil/StETofGeometry.cxx +++ b/StRoot/StETofUtil/StETofGeometry.cxx @@ -232,6 +232,12 @@ StETofNode::buildMembers() void StETofNode::setSafetyMargins( const double* margins ) { + if (!margins) { + mSafetyMarginX = 0; + mSafetyMarginY = 0; + return; + } + if( margins[ 0 ] < 0 || margins[ 1 ] < 0 ) { LOG_DEBUG << "StETofNode::setSafetyMargins() -- WARNING: input values are negative" << endm; } @@ -564,7 +570,7 @@ StETofGeometry::~StETofGeometry() void -StETofGeometry::init( TGeoManager* geoManager, const double* safetyMargins = initializer_list({0, 0}).begin(), const bool& useHelixSwimmer = false ) +StETofGeometry::init( TGeoManager* geoManager, const double* safetyMargins, const bool useHelixSwimmer ) { if( !geoManager ) { LOG_ERROR << " *** StETofGeometry::Init - cannot find TGeoManager *** " << endm; diff --git a/StRoot/StETofUtil/StETofGeometry.h b/StRoot/StETofUtil/StETofGeometry.h index d23eb23d3e1..b608a4341da 100644 --- a/StRoot/StETofUtil/StETofGeometry.h +++ b/StRoot/StETofUtil/StETofGeometry.h @@ -285,8 +285,7 @@ class StETofGeometry : public TNamed { StETofGeometry( const char* name = "etofGeo", const char* title = "simplified ETOF Geometry" ); ~StETofGeometry(); - void init( TGeoManager* geoManager ); - void init( TGeoManager* geoManager, const double* safetyMargins, const bool& useHelixSwimmer ); + void init( TGeoManager* geoManager, const double* safetyMargins = 0, const bool useHelixSwimmer = false ); void reset(); @@ -396,4 +395,4 @@ inline bool StETofGeometry::isDebugOn() const { return mDebug; } inline void StETofGeometry::setFileNameAlignParam(std::string fileNameAlignParam) {mFileNameAlignParam = fileNameAlignParam;} -#endif /// STETOFGEOMETRY_H \ No newline at end of file +#endif /// STETOFGEOMETRY_H diff --git a/StRoot/StEventUtilities/StEbyET0.cxx b/StRoot/StEventUtilities/StEbyET0.cxx index b256b5f6f86..98d1c188da2 100644 --- a/StRoot/StEventUtilities/StEbyET0.cxx +++ b/StRoot/StEventUtilities/StEbyET0.cxx @@ -44,12 +44,13 @@ double StEbyET0::getTime(StEvent* event, int mode) { mRunId = event->runId(); mEventId = event->id(); + mTime = 0.; // default event time should always be zero, not correcting for some other global T0 // check for calibration mode + // fill tree without mTime subtracted if (mode == 1) fillTree(event); // determine event time - mTime = 0.; // default should always be zero, not correcting for some other global T0 double info[12]; St_EbyET0C* ebyeTable = St_EbyET0C::instance(); for (int row = 0; row < ebyeTable->GetNRows(); row++) { @@ -95,6 +96,10 @@ double StEbyET0::getTime(StEvent* event, int mode) { break; } + // check for QA mode + // fill tree with mTime added + if (mode == 2) fillTree(event); + return mTime; } //_____________________________________________________________________________ @@ -217,6 +222,9 @@ void StEbyET0::getTpcInfo(StEvent* event, double* info) { // because constant shifts aren't relavant for the EbyET0 calibration double time = coorS.position().z() / (StTpcDb::instance()->DriftVelocity()*1e-6); + // apply the EbyE T0 time correction (if it is already determined) + time += mTime; + if (innerRow) { if (tb < innerMaxTB && tb > innerMinTB) { // use only prompt hit candidates if (sector <= 12) { diff --git a/StRoot/StMuDSTMaker/COMMON/StMuFcsUtil.cxx b/StRoot/StMuDSTMaker/COMMON/StMuFcsUtil.cxx index 7137c4662b3..0ee7919ef4a 100644 --- a/StRoot/StMuDSTMaker/COMMON/StMuFcsUtil.cxx +++ b/StRoot/StMuDSTMaker/COMMON/StMuFcsUtil.cxx @@ -92,7 +92,12 @@ void StMuFcsUtil::fillMuFcsHits(StMuFcsCollection* muFcs, ); // set the corrected energy too - muFcsHit->setEnergy( vecHit[i]->energy() ); + muFcsHit->setAdcSum ( vecHit[i]->adcSum() ); + muFcsHit->setFitPeak ( vecHit[i]->fitPeak() ); + muFcsHit->setFitSigma( vecHit[i]->fitSigma()); + muFcsHit->setFitChi2 ( vecHit[i]->fitChi2() ); + muFcsHit->setNPeak ( vecHit[i]->nPeak() ); + muFcsHit->setEnergy ( vecHit[i]->energy() ); // store in memory map between StEvent and StMuDst version mMapHits[ fcscol->hits(idet)[i] ] = muFcsHit; @@ -284,6 +289,11 @@ void StMuFcsUtil::fillFcsHits(StFcsCollection* fcscol, l, muHit->data() ); - hit->setEnergy( muHit->energy() ); + hit->setAdcSum ( muHit->adcSum() ); + hit->setFitPeak ( muHit->fitPeak() ); + hit->setFitSigma( muHit->fitSigma()); + hit->setFitChi2 ( muHit->fitChi2() ); + hit->setNPeak ( muHit->nPeak() ); + hit->setEnergy ( muHit->energy() ); } // while } // fillFcsHits diff --git a/StarDb/ctf/ctg/ctb.C b/StarDb/ctf/ctg/ctb.C index fa2f21a77b5..e6c49ccb2d2 100644 --- a/StarDb/ctf/ctg/ctb.C +++ b/StarDb/ctf/ctg/ctb.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ctg/ctb Allocated rows: 1 Used rows: 1 Row size: 68 bytes // Table: ctg_geo_st[0]--> ctg_geo_st[0] @@ -28,5 +28,5 @@ memset(&row,0,tableSet->GetRowSize()); row.tray_phi_zero = 0; // ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/ctg/ctb_slat.C b/StarDb/ctf/ctg/ctb_slat.C index 505208a63bf..c1f42698e3e 100644 --- a/StarDb/ctf/ctg/ctb_slat.C +++ b/StarDb/ctf/ctg/ctb_slat.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // params/ctf/ctg/ctb_slat Allocated rows: 240 Used rows: 240 Row size: 32 bytes // Table: ctg_slat_st[0]--> ctg_slat_st[239] @@ -23,5 +23,5 @@ St_ctg_slat *tableSet = new St_ctg_slat("ctb_slat",240); } } // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/ctg/ctb_slat_eta.C b/StarDb/ctf/ctg/ctb_slat_eta.C index 0fba770523e..6e5ce69bf0b 100644 --- a/StarDb/ctf/ctg/ctb_slat_eta.C +++ b/StarDb/ctf/ctg/ctb_slat_eta.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ctg/ctb_slat_eta Allocated rows: 4 Used rows: 4 Row size: 36 bytes // Table: ctg_slat_eta_st[0]--> ctg_slat_eta_st[3] @@ -53,5 +53,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_min = 241.49; // ; tableSet->AddAt(&row,3); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/ctg/ctb_slat_phi.C b/StarDb/ctf/ctg/ctb_slat_phi.C index 53b2ebcafb3..42e7147778e 100644 --- a/StarDb/ctf/ctg/ctb_slat_phi.C +++ b/StarDb/ctf/ctg/ctb_slat_phi.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ctg/ctb_slat_phi Allocated rows: 60 Used rows: 60 Row size: 16 bytes // Table: ctg_slat_phi_st[0]--> ctg_slat_phi_st[59] @@ -369,5 +369,5 @@ memset(&row,0,tableSet->GetRowSize()); row.phi_min = 351.092; // ; tableSet->AddAt(&row,59); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/ctg/tof.C b/StarDb/ctf/ctg/tof.C index ffa9065bd4b..8cb8290701d 100644 --- a/StarDb/ctf/ctg/tof.C +++ b/StarDb/ctf/ctg/tof.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ctg/tof Allocated rows: 1 Used rows: 1 Row size: 68 bytes // Table: ctg_geo_st[0]--> ctg_geo_st[0] @@ -28,5 +28,5 @@ memset(&row,0,tableSet->GetRowSize()); row.tray_phi_zero = 0; // ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/ctg/tof_slat.C b/StarDb/ctf/ctg/tof_slat.C index 2400050c29b..69be2e8158c 100644 --- a/StarDb/ctf/ctg/tof_slat.C +++ b/StarDb/ctf/ctg/tof_slat.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // params/ctf/ctg/tof_slat Allocated rows: 5400 Used rows: 5400 Row size: 32 bytes // Table: ctg_slat_st[0]--> ctg_slat_st[5399] @@ -23,5 +23,5 @@ St_ctg_slat *tableSet = new St_ctg_slat("tof_slat",5400); } } // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/ctg/tof_slat_eta.C b/StarDb/ctf/ctg/tof_slat_eta.C index 3fd7613e603..cc79c23e6d4 100644 --- a/StarDb/ctf/ctg/tof_slat_eta.C +++ b/StarDb/ctf/ctg/tof_slat_eta.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ctg/tof_slat_eta Allocated rows: 18 Used rows: 18 Row size: 36 bytes // Table: ctg_slat_eta_st[0]--> ctg_slat_eta_st[17] @@ -207,5 +207,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_min = 205.56; // ; tableSet->AddAt(&row,17); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/ctg/tof_slat_phi.C b/StarDb/ctf/ctg/tof_slat_phi.C index 766c4d21e18..03007ded5ef 100644 --- a/StarDb/ctf/ctg/tof_slat_phi.C +++ b/StarDb/ctf/ctg/tof_slat_phi.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ctg/tof_slat_phi Allocated rows: 300 Used rows: 300 Row size: 16 bytes // Table: ctg_slat_phi_st[0]--> ctg_slat_phi_st[299] @@ -1809,5 +1809,5 @@ memset(&row,0,tableSet->GetRowSize()); row.phi_min = 355.732; // ; tableSet->AddAt(&row,299); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/cts/cts_ctb.C b/StarDb/ctf/cts/cts_ctb.C index 7c7ca31cf75..3d91a214b89 100644 --- a/StarDb/ctf/cts/cts_ctb.C +++ b/StarDb/ctf/cts/cts_ctb.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cts/cts_ctb Allocated rows: 1 Used rows: 1 Row size: 1076 bytes // Table: cts_mpara_st[0]--> cts_mpara_st[0] @@ -280,5 +280,5 @@ memset(&row,0,tableSet->GetRowSize()); row.zero_suppression = 1; // ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ctf/cts/cts_tof.C b/StarDb/ctf/cts/cts_tof.C index 221737839f5..f5941ee3d6f 100644 --- a/StarDb/ctf/cts/cts_tof.C +++ b/StarDb/ctf/cts/cts_tof.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cts/cts_tof Allocated rows: 1 Used rows: 1 Row size: 1076 bytes // Table: cts_mpara_st[0]--> cts_mpara_st[0] @@ -280,5 +280,5 @@ memset(&row,0,tableSet->GetRowSize()); row.zero_suppression = 1; // ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ebye/sca/sca_const.C b/StarDb/ebye/sca/sca_const.C index bd8db6b914f..2ef42f60287 100644 --- a/StarDb/ebye/sca/sca_const.C +++ b/StarDb/ebye/sca/sca_const.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/sca/sca_const Allocated rows: 1 Used rows: 1 Row size: 112 bytes // Table: sca_const_st[0]--> sca_const_st[0] @@ -39,5 +39,5 @@ memset(&row,0,tableSet->GetRowSize()); row.perfectdither = 0; // ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ebye/sca/sca_filter_const.C b/StarDb/ebye/sca/sca_filter_const.C index 195886a88c1..6602aa039c1 100644 --- a/StarDb/ebye/sca/sca_filter_const.C +++ b/StarDb/ebye/sca/sca_filter_const.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/sca/sca_filter_const Allocated rows: 1 Used rows: 1 Row size: 28 bytes // Table: sca_filter_const_st[0]--> sca_filter_const_st[0] @@ -18,5 +18,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nGoodTraks = 50; // total no. of good tracks ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ebye/sca/sca_switch.C b/StarDb/ebye/sca/sca_switch.C index 63ee40162ec..e4fe71af735 100644 --- a/StarDb/ebye/sca/sca_switch.C +++ b/StarDb/ebye/sca/sca_switch.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/sca/sca_switch Allocated rows: 1 Used rows: 1 Row size: 16 bytes // Table: sca_switch_st[0]--> sca_switch_st[0] @@ -15,5 +15,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nEvents = 0; // ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/ems_cal_control.C b/StarDb/emc/cal/ems_cal_control.C index cdbae231a57..04c3cf441ba 100644 --- a/StarDb/emc/cal/ems_cal_control.C +++ b/StarDb/emc/cal/ems_cal_control.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/ems_cal_control Allocated rows: 1 Used rows: 1 Row size: 52 bytes // Table: ems_cal_control_st[0]--> ems_cal_control_st[0] @@ -25,5 +25,5 @@ memset(&row,0,tableSet->GetRowSize()); row.occupancy = 0.5; // hit occupancy toy_simulator mode=1 ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bemc.C b/StarDb/emc/cal/org_ped_bemc.C index 33635ad62c7..b8ca0da4c39 100644 --- a/StarDb/emc/cal/org_ped_bemc.C +++ b/StarDb/emc/cal/org_ped_bemc.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bemc Allocated rows: 4800 Used rows: 4800 Row size: 4 bytes // Table: emc_pedestal_st[0]--> emc_pedestal_st[4799] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.ped = 0; // pedestal for ADC channel ; for (Int_t i=0;i<4800;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bemc_h.C b/StarDb/emc/cal/org_ped_bemc_h.C index c5b3d35f76f..eb79a6b34a5 100644 --- a/StarDb/emc/cal/org_ped_bemc_h.C +++ b/StarDb/emc/cal/org_ped_bemc_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bemc_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 2; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bprs.C b/StarDb/emc/cal/org_ped_bprs.C index a93bbcd7d7a..a6b91e91589 100644 --- a/StarDb/emc/cal/org_ped_bprs.C +++ b/StarDb/emc/cal/org_ped_bprs.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bprs Allocated rows: 4800 Used rows: 4800 Row size: 4 bytes // Table: emc_pedestal_st[0]--> emc_pedestal_st[4799] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.ped = 0; // pedestal for ADC channel ; for (Int_t i=0;i<4800;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bprs_h.C b/StarDb/emc/cal/org_ped_bprs_h.C index 36853761b0a..884e40b83d3 100644 --- a/StarDb/emc/cal/org_ped_bprs_h.C +++ b/StarDb/emc/cal/org_ped_bprs_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bprs_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 2; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bsmde.C b/StarDb/emc/cal/org_ped_bsmde.C index 0d3cf1952d2..d10c5c342f4 100644 --- a/StarDb/emc/cal/org_ped_bsmde.C +++ b/StarDb/emc/cal/org_ped_bsmde.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bsmde Allocated rows: 18000 Used rows: 18000 Row size: 4 bytes // Table: emc_pedestal_st[0]--> emc_pedestal_st[17999] @@ -10,5 +10,5 @@ St_DataSet *CreateTable() { row.ped = 0; // pedestal for ADC channel ; for (Int_t i=0;i<18000;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bsmde_h.C b/StarDb/emc/cal/org_ped_bsmde_h.C index 57acf404cda..60d49042e98 100644 --- a/StarDb/emc/cal/org_ped_bsmde_h.C +++ b/StarDb/emc/cal/org_ped_bsmde_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bsmde_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 1; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bsmdp.C b/StarDb/emc/cal/org_ped_bsmdp.C index 958b66f2e9d..a3aac06a465 100644 --- a/StarDb/emc/cal/org_ped_bsmdp.C +++ b/StarDb/emc/cal/org_ped_bsmdp.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bsmdp Allocated rows: 18000 Used rows: 18000 Row size: 4 bytes // Table: emc_pedestal_st[0]--> emc_pedestal_st[17999] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { for (Int_t i=0;i<18000;i++) tableSet->AddAt(&row,i); // // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_bsmdp_h.C b/StarDb/emc/cal/org_ped_bsmdp_h.C index 430b6fbea44..fe81b1ab7a9 100644 --- a/StarDb/emc/cal/org_ped_bsmdp_h.C +++ b/StarDb/emc/cal/org_ped_bsmdp_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_bsmdp_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 15; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_eemc.C b/StarDb/emc/cal/org_ped_eemc.C index a0786f948f0..6d4940ea34a 100644 --- a/StarDb/emc/cal/org_ped_eemc.C +++ b/StarDb/emc/cal/org_ped_eemc.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_eemc Allocated rows: 1440 Used rows: 1440 Row size: 4 bytes // Table: emc_pedestal_st[0]--> emc_pedestal_st[1439] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.ped = 0; // pedestal for ADC channel ; for (Int_t i=0;i<1440;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_eemc_h.C b/StarDb/emc/cal/org_ped_eemc_h.C index c70e90b85d2..13fbab92544 100644 --- a/StarDb/emc/cal/org_ped_eemc_h.C +++ b/StarDb/emc/cal/org_ped_eemc_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_eemc_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 5; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_eprs.C b/StarDb/emc/cal/org_ped_eprs.C index 789637b967d..64af4b0e69e 100644 --- a/StarDb/emc/cal/org_ped_eprs.C +++ b/StarDb/emc/cal/org_ped_eprs.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_eprs Allocated rows: 1440 Used rows: 1440 Row size: 4 bytes // Table: emc_pedestal_st[0]--> emc_pedestal_st[1439] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.ped = 0; // pedestal for ADC channel ; for (Int_t i=0;i<1440;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_ped_eprs_h.C b/StarDb/emc/cal/org_ped_eprs_h.C index 8ea9f8052a3..7f00f7e6ba7 100644 --- a/StarDb/emc/cal/org_ped_eprs_h.C +++ b/StarDb/emc/cal/org_ped_eprs_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_ped_eprs_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 5; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bemc.C b/StarDb/emc/cal/org_slp_bemc.C index af1a8b6aa38..2745b4a329a 100644 --- a/StarDb/emc/cal/org_slp_bemc.C +++ b/StarDb/emc/cal/org_slp_bemc.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bemc Allocated rows: 4800 Used rows: 4800 Row size: 4 bytes // Table: emc_adcslope_st[0]--> emc_adcslope_st[4799] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.p0 = 1; // adc slope for ADC channel ; for (Int_t i=0;i<4800;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bemc_h.C b/StarDb/emc/cal/org_slp_bemc_h.C index 7f1b5b3d89b..8b15b7d7dc3 100644 --- a/StarDb/emc/cal/org_slp_bemc_h.C +++ b/StarDb/emc/cal/org_slp_bemc_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bemc_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 2; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bprs.C b/StarDb/emc/cal/org_slp_bprs.C index fecf7dc0074..236cea7e4f5 100644 --- a/StarDb/emc/cal/org_slp_bprs.C +++ b/StarDb/emc/cal/org_slp_bprs.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bprs Allocated rows: 4800 Used rows: 4800 Row size: 4 bytes // Table: emc_adcslope_st[0]--> emc_adcslope_st[4799] @@ -11,5 +11,5 @@ St_DataSet *CreateTable() { row.p0 = 1; // adc slope for ADC channel ; for (Int_t i=0;i<4800;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bprs_h.C b/StarDb/emc/cal/org_slp_bprs_h.C index ddd373df3d7..4bde731335f 100644 --- a/StarDb/emc/cal/org_slp_bprs_h.C +++ b/StarDb/emc/cal/org_slp_bprs_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bprs_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 2; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bsmde.C b/StarDb/emc/cal/org_slp_bsmde.C index 0ff848ae368..783315b52b2 100644 --- a/StarDb/emc/cal/org_slp_bsmde.C +++ b/StarDb/emc/cal/org_slp_bsmde.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bsmde Allocated rows: 18000 Used rows: 18000 Row size: 4 bytes // Table: emc_adcslope_st[0]--> emc_adcslope_st[17999] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.p0 = 1; // adc slope for ADC channel ; for (Int_t i=0;i<18000;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bsmde_h.C b/StarDb/emc/cal/org_slp_bsmde_h.C index 7181b7c0400..4efe97fc287 100644 --- a/StarDb/emc/cal/org_slp_bsmde_h.C +++ b/StarDb/emc/cal/org_slp_bsmde_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bsmde_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 1; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bsmdp.C b/StarDb/emc/cal/org_slp_bsmdp.C index f2eca1512c5..9ebfef3bd22 100644 --- a/StarDb/emc/cal/org_slp_bsmdp.C +++ b/StarDb/emc/cal/org_slp_bsmdp.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bsmdp Allocated rows: 18000 Used rows: 18000 Row size: 4 bytes // Table: emc_adcslope_st[0]--> emc_adcslope_st[17999] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.p0 = 1; // adc slope for ADC channel ; for (Int_t i=0;i<18000;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_bsmdp_h.C b/StarDb/emc/cal/org_slp_bsmdp_h.C index 301a22414d1..6706ea62404 100644 --- a/StarDb/emc/cal/org_slp_bsmdp_h.C +++ b/StarDb/emc/cal/org_slp_bsmdp_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_bsmdp_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 15; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_eemc.C b/StarDb/emc/cal/org_slp_eemc.C index 4e33608365a..345c79380c9 100644 --- a/StarDb/emc/cal/org_slp_eemc.C +++ b/StarDb/emc/cal/org_slp_eemc.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_eemc Allocated rows: 1440 Used rows: 1440 Row size: 4 bytes // Table: emc_adcslope_st[0]--> emc_adcslope_st[1439] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.p0 = 1; // adc slope for ADC channel ; for (Int_t i=0;i<1440;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_eemc_h.C b/StarDb/emc/cal/org_slp_eemc_h.C index e6f0eb0b0c9..375722dbffd 100644 --- a/StarDb/emc/cal/org_slp_eemc_h.C +++ b/StarDb/emc/cal/org_slp_eemc_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_eemc_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 5; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_eprs.C b/StarDb/emc/cal/org_slp_eprs.C index dfa5c632772..272fa01efa3 100644 --- a/StarDb/emc/cal/org_slp_eprs.C +++ b/StarDb/emc/cal/org_slp_eprs.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_eprs Allocated rows: 1440 Used rows: 1440 Row size: 4 bytes // Table: emc_adcslope_st[0]--> emc_adcslope_st[1439] @@ -12,5 +12,5 @@ St_DataSet *CreateTable() { row.p0 = 1; // adc slope for ADC channel ; for (Int_t i=0;i<1440;i++) tableSet->AddAt(&row,i); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/cal/org_slp_eprs_h.C b/StarDb/emc/cal/org_slp_eprs_h.C index 36608dadbd6..a4c81f56886 100644 --- a/StarDb/emc/cal/org_slp_eprs_h.C +++ b/StarDb/emc/cal/org_slp_eprs_h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/cal/org_slp_eprs_h Allocated rows: 1 Used rows: 1 Row size: 24 bytes // Table: emc_calib_header_st[0]--> emc_calib_header_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.nsub = 5; // see emc_def.h ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/ems/control_toadc.C b/StarDb/emc/ems/control_toadc.C index c85985c4029..08e3646ac5e 100644 --- a/StarDb/emc/ems/control_toadc.C +++ b/StarDb/emc/ems/control_toadc.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ems/control_toadc Allocated rows: 1 Used rows: 1 Row size: 224 bytes // Table: control_toadc_st[0]--> control_toadc_st[0] @@ -75,5 +75,5 @@ memset(&row,0,tableSet->GetRowSize()); row.c3[7] = 0; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/ems/ems_control.C b/StarDb/emc/ems/ems_control.C index df69b0b0bce..acb7c6bc515 100644 --- a/StarDb/emc/ems/ems_control.C +++ b/StarDb/emc/ems/ems_control.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ems/ems_control Allocated rows: 1 Used rows: 1 Row size: 340 bytes // Table: ems_control_st[0]--> ems_control_st[0] @@ -96,5 +96,5 @@ memset(&row,0,tableSet->GetRowSize()); row.ideal_jet_mode = 1; // mode for idel jet finder 1=ideal,2=1-nuotrino,3=charged only ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/jet/emc_egrid_par.C b/StarDb/emc/jet/emc_egrid_par.C index 2f3447be461..ce88173e4ac 100644 --- a/StarDb/emc/jet/emc_egrid_par.C +++ b/StarDb/emc/jet/emc_egrid_par.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/jet/emc_egrid_par Allocated rows: 1 Used rows: 1 Row size: 16 bytes // Table: emc_egrid_par_st[0]--> emc_egrid_par_st[0] @@ -15,5 +15,5 @@ memset(&row,0,tableSet->GetRowSize()); row.ideal_phi_nbin = 100; // Size of energy matrix for ideal egrid ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/emc/jet/emc_jetpar.C b/StarDb/emc/jet/emc_jetpar.C index 4059f61d7f3..ca5aec2271e 100644 --- a/StarDb/emc/jet/emc_jetpar.C +++ b/StarDb/emc/jet/emc_jetpar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/jet/emc_jetpar Allocated rows: 1 Used rows: 1 Row size: 76 bytes // Table: emc_jetpar_st[0]--> emc_jetpar_st[0] @@ -30,5 +30,5 @@ memset(&row,0,tableSet->GetRowSize()); row.eta_min = -2; // maxinum eta for jet ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ftpc/ftpcClusterPars.C b/StarDb/ftpc/ftpcClusterPars.C index 243e19cd811..b8eae2bb8fc 100644 --- a/StarDb/ftpc/ftpcClusterPars.C +++ b/StarDb/ftpc/ftpcClusterPars.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ftpcClusterPars Allocated rows: 1 Used rows: 1 Row size: 156 bytes // Table: ftpcClusterPars_st[0]--> ftpcClusterPars_st[0] @@ -54,5 +54,5 @@ memset(&row,0,tableSet->GetRowSize()); tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ftpc/ftpcFastSimGas.C b/StarDb/ftpc/ftpcFastSimGas.C index babd5a479e0..110c12a3797 100644 --- a/StarDb/ftpc/ftpcFastSimGas.C +++ b/StarDb/ftpc/ftpcFastSimGas.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ftpcFastSimGas Allocated rows: 1 Used rows: 1 Row size: 100 bytes // Table: ftpcFastSimGas_st[0]--> ftpcFastSimGas_st[0] @@ -36,5 +36,5 @@ memset(&row,0,tableSet->GetRowSize()); row.errorAzimuthalEstimates[3] = 0; // D= ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ftpc/ftpcFastSimPars.C b/StarDb/ftpc/ftpcFastSimPars.C index 50d66809805..5b8c18c84e1 100644 --- a/StarDb/ftpc/ftpcFastSimPars.C +++ b/StarDb/ftpc/ftpcFastSimPars.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ftpcFastSimPars Allocated rows: 1 Used rows: 1 Row size: 44 bytes // Table: ftpcFastSimPars_st[0]--> ftpcFastSimPars_st[0] @@ -22,5 +22,5 @@ memset(&row,0,tableSet->GetRowSize()); row.clusterChargeConversionFactor = 6.; // D= convert adc counts to charge; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ftpc/ftpcSlowSimGas.C b/StarDb/ftpc/ftpcSlowSimGas.C index d339d99c027..0094a5ffcd8 100644 --- a/StarDb/ftpc/ftpcSlowSimGas.C +++ b/StarDb/ftpc/ftpcSlowSimGas.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ftpcSlowSimGas Allocated rows: 132 Used rows: 132 Row size: 24 bytes // Table: ftpcSlowSimGas_st[0]--> ftpcSlowSimGas_st[131] @@ -1065,5 +1065,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lorentzAngle = 0.130551; // lorentz angle of drift electrons ; tableSet->AddAt(&row,131); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ftpc/ftpcSlowSimPars.C b/StarDb/ftpc/ftpcSlowSimPars.C index d37568f0215..a6bdc61ca3d 100644 --- a/StarDb/ftpc/ftpcSlowSimPars.C +++ b/StarDb/ftpc/ftpcSlowSimPars.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ftpcSlowSimPars Allocated rows: 1 Used rows: 1 Row size: 44 bytes // Table: ftpcSlowSimPars_st[0]--> ftpcSlowSimPars_st[0] @@ -22,5 +22,5 @@ memset(&row,0,tableSet->GetRowSize()); row.slowSimPressure = 1013.25; // D = atmospheric pressure used; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ftpc/ftpcTrackingPars.C b/StarDb/ftpc/ftpcTrackingPars.C index 2c37048201a..dfe94b13127 100644 --- a/StarDb/ftpc/ftpcTrackingPars.C +++ b/StarDb/ftpc/ftpcTrackingPars.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ftpcTrackingPars Allocated rows: 1 Used rows: 1 Row size: ??? bytes // Table: ftpcTrackingPars_st[0]--> ftpcTrackingPars_st[0] @@ -106,5 +106,5 @@ memset(&row,0,tableSet->GetRowSize()); tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/ftpc/ftpcdEdxPars.C b/StarDb/ftpc/ftpcdEdxPars.C index 5d9fe27f15e..2aa79a373dd 100644 --- a/StarDb/ftpc/ftpcdEdxPars.C +++ b/StarDb/ftpc/ftpcdEdxPars.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ftpcdEdxPars Allocated rows: 1 Used rows: 1 Row size: 40 bytes // Table: ftpcdEdxPars_st[0]--> ftpcdEdxPars_st[0] @@ -21,5 +21,5 @@ memset(&row,0,tableSet->GetRowSize()); row.a_large_number = 1e+10; // a large number ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/global/vertices/stk_vtx.C b/StarDb/global/vertices/stk_vtx.C index 2f8c2cb1bbf..016feed97ff 100644 --- a/StarDb/global/vertices/stk_vtx.C +++ b/StarDb/global/vertices/stk_vtx.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/vertices/stk_vtx Allocated rows: 1 Used rows: 1 Row size: 48 bytes // Table: stk_vtx_st[0]--> stk_vtx_st[0] @@ -23,5 +23,5 @@ memset(&row,0,tableSet->GetRowSize()); row.x[2] = 0; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/global/vertices/stk_vtx_direct.C b/StarDb/global/vertices/stk_vtx_direct.C index 1bd5231bfe3..66ab6d4e10d 100644 --- a/StarDb/global/vertices/stk_vtx_direct.C +++ b/StarDb/global/vertices/stk_vtx_direct.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/vertices/stk_vtx_direct Allocated rows: 1 Used rows: 1 Row size: 16 bytes // Table: stk_vtx_direct_st[0]--> stk_vtx_direct_st[0] @@ -15,5 +15,5 @@ memset(&row,0,tableSet->GetRowSize()); row.sx[2] = 0.0005; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/mwc/mwcpars/cal.C b/StarDb/mwc/mwcpars/cal.C index 8fa0bd91066..20a527e93c1 100644 --- a/StarDb/mwc/mwcpars/cal.C +++ b/StarDb/mwc/mwcpars/cal.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/mwcpars/cal Allocated rows: 384 Used rows: 384 Row size: 12 bytes // Table: mwc_cal_st[0]--> mwc_cal_st[383] @@ -1929,5 +1929,5 @@ memset(&row,0,tableSet->GetRowSize()); row.ps = 0; // Pedestal dispersion ; tableSet->AddAt(&row,383); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/mwc/mwcpars/geom.C b/StarDb/mwc/mwcpars/geom.C index 1f0f5b2537f..ea2b197b4ca 100644 --- a/StarDb/mwc/mwcpars/geom.C +++ b/StarDb/mwc/mwcpars/geom.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/mwcpars/geom Allocated rows: 1 Used rows: 1 Row size: 28 bytes // Table: mwc_geo_st[0]--> mwc_geo_st[0] @@ -18,5 +18,5 @@ memset(&row,0,tableSet->GetRowSize()); row.r2min = 125.488; // Inner radius outer sectors ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/mwc/mwcpars/mpar.C b/StarDb/mwc/mwcpars/mpar.C index 9c2674c37d4..c7c1b0ce567 100644 --- a/StarDb/mwc/mwcpars/mpar.C +++ b/StarDb/mwc/mwcpars/mpar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/mwcpars/mpar Allocated rows: 1 Used rows: 1 Row size: 32 bytes // Table: mwc_mpar_st[0]--> mwc_mpar_st[0] @@ -19,5 +19,5 @@ memset(&row,0,tableSet->GetRowSize()); row.min_ion = 0; // Minimum ionization ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/sgrpars/pix_info.C b/StarDb/svt/sgrpars/pix_info.C index 249b3a93d27..a03fda85729 100644 --- a/StarDb/svt/sgrpars/pix_info.C +++ b/StarDb/svt/sgrpars/pix_info.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/sgrpars/pix_info Allocated rows: 4 Used rows: 4 Row size: 28 bytes // Table: sgr_pixmap_st[0]--> sgr_pixmap_st[3] @@ -45,5 +45,5 @@ memset(&row,0,tableSet->GetRowSize()); row.ZMax = 20; // Maximum Zscaled values in pixmap. ; tableSet->AddAt(&row,3); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/sprpars/sprpar.C b/StarDb/svt/sprpars/sprpar.C index 5b1478db1cc..0871bb1a8e9 100644 --- a/StarDb/svt/sprpars/sprpar.C +++ b/StarDb/svt/sprpars/sprpar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/sprpars/sprpar Allocated rows: 1 Used rows: 1 Row size: 8 bytes // Table: spr_sprpar_st[0]--> spr_sprpar_st[0] @@ -13,5 +13,5 @@ memset(&row,0,tableSet->GetRowSize()); row.p = 0; // momentum cut off for dE/dx in GeV/c ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/srspars/srs_activea.C b/StarDb/svt/srspars/srs_activea.C index ab5e9cc50f9..d9351ebdb1b 100644 --- a/StarDb/svt/srspars/srs_activea.C +++ b/StarDb/svt/srspars/srs_activea.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/srspars/srs_activea Allocated rows: 4 Used rows: 4 Row size: 44 bytes // Table: srs_activea_st[0]--> srs_activea_st[3] @@ -61,5 +61,5 @@ memset(&row,0,tableSet->GetRowSize()); row.param[9] = 0; tableSet->AddAt(&row,3); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/srspars/srs_srspar.C b/StarDb/svt/srspars/srs_srspar.C index a6ed275e8c1..07d85b1d831 100644 --- a/StarDb/svt/srspars/srs_srspar.C +++ b/StarDb/svt/srspars/srs_srspar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/srspars/srs_srspar Allocated rows: 1 Used rows: 1 Row size: 84 bytes // Table: srs_srspar_st[0]--> srs_srspar_st[0] @@ -32,5 +32,5 @@ memset(&row,0,tableSet->GetRowSize()); row.vd = 700000; // drift velocity ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/stkpars/stk_filler.C b/StarDb/svt/stkpars/stk_filler.C index 9c3588059de..6eb04b3b631 100644 --- a/StarDb/svt/stkpars/stk_filler.C +++ b/StarDb/svt/stkpars/stk_filler.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/stkpars/stk_filler Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: stk_filler_st[0]--> stk_filler_st[0] @@ -71,5 +71,5 @@ memset(&row,0,tableSet->GetRowSize()); row.wth87 = 120; // wafer cone 7 to 8 ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/svgpars/config.C b/StarDb/svt/svgpars/config.C index 5f01d56229b..d783288dffd 100644 --- a/StarDb/svt/svgpars/config.C +++ b/StarDb/svt/svgpars/config.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/svgpars/config Allocated rows: 1 Used rows: 1 Row size: 1168 bytes // Table: svg_config_st[0]--> svg_config_st[0] @@ -303,5 +303,5 @@ memset(&row,0,tableSet->GetRowSize()); row.x[2] = 0; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/svgpars/geom.C b/StarDb/svt/svgpars/geom.C index 09c362db7ea..5eafa14a849 100644 --- a/StarDb/svt/svgpars/geom.C +++ b/StarDb/svt/svgpars/geom.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/svgpars/geom Allocated rows: 536 Used rows: 536 Row size: 68 bytes // Table: svg_geom_st[0]--> svg_geom_st[535] @@ -10194,5 +10194,5 @@ memset(&row,0,tableSet->GetRowSize()); row.x[2] = 32.25; tableSet->AddAt(&row,535); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/svgpars/geom.C.6cm b/StarDb/svt/svgpars/geom.C.6cm index ada946af6fb..80f0c168f84 100644 --- a/StarDb/svt/svgpars/geom.C.6cm +++ b/StarDb/svt/svgpars/geom.C.6cm @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/svgpars/geom Allocated rows: 536 Used rows: 536 Row size: 68 bytes // Table: svg_geom_st[0]--> svg_geom_st[535] @@ -10194,5 +10194,5 @@ memset(&row,0,tableSet->GetRowSize()); row.x[2] = 32.25; tableSet->AddAt(&row,535); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/svgpars/geom.C.MDC4 b/StarDb/svt/svgpars/geom.C.MDC4 index 1b07c418013..3fd343d1e8a 100644 --- a/StarDb/svt/svgpars/geom.C.MDC4 +++ b/StarDb/svt/svgpars/geom.C.MDC4 @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/svgpars/geom Allocated rows: 536 Used rows: 536 Row size: 68 bytes // Table: svg_geom_st[0]--> svg_geom_st[535] @@ -10194,5 +10194,5 @@ memset(&row,0,tableSet->GetRowSize()); row.x[2] = 32.25; tableSet->AddAt(&row,535); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/svgpars/geomy1l.C b/StarDb/svt/svgpars/geomy1l.C index 81112b847cb..15cc75f6e1f 100644 --- a/StarDb/svt/svgpars/geomy1l.C +++ b/StarDb/svt/svgpars/geomy1l.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/svgpars/geom Allocated rows: 7 Used rows: 7 // Table: svg_geom_st[0]--> svg_geom_st[7] @@ -142,5 +142,5 @@ memset(&row,0,tableSet->GetRowSize()); row.x[2] = -18; tableSet->AddAt(&row,6); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/svt/svgpars/shape.C b/StarDb/svt/svgpars/shape.C index 4f9269636f1..ed1b4753e07 100644 --- a/StarDb/svt/svgpars/shape.C +++ b/StarDb/svt/svgpars/shape.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/svgpars/shape Allocated rows: 2 Used rows: 2 Row size: 88 bytes // Table: svg_shape_st[0]--> svg_shape_st[1] @@ -57,5 +57,5 @@ memset(&row,0,tableSet->GetRowSize()); row.shape[9] = 0; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/fmtpars/fmtpar.C b/StarDb/tpc/fmtpars/fmtpar.C index c0f20279de0..1468efb47cb 100644 --- a/StarDb/tpc/fmtpars/fmtpar.C +++ b/StarDb/tpc/fmtpars/fmtpar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/fmtpars/fmtpar Allocated rows: 1 Used rows: 1 Row size: 88 bytes // Table: tfc_fmtpar_st[0]--> tfc_fmtpar_st[0] @@ -33,5 +33,5 @@ memset(&row,0,tableSet->GetRowSize()); row.printf = 0; // output flag ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tclpars/tclpar.C b/StarDb/tpc/tclpars/tclpar.C index 52234b25102..a093b52c99d 100644 --- a/StarDb/tpc/tclpars/tclpar.C +++ b/StarDb/tpc/tclpars/tclpar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tclpars/tclpar Allocated rows: 1 Used rows: 1 Row size: 48 bytes // Table: tcl_tclpar_st[0]--> tcl_tclpar_st[0] @@ -23,5 +23,5 @@ memset(&row,0,tableSet->GetRowSize()); row.triage_rmscut = 3; // cut on rms_pad + rms_tdc ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tclpars/type.C b/StarDb/tpc/tclpars/type.C index 1b4f6ffb437..47c0c7c5af8 100644 --- a/StarDb/tpc/tclpars/type.C +++ b/StarDb/tpc/tclpars/type.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tclpars/type Allocated rows: 1 Used rows: 1 Row size: 28 bytes // Table: tcl_tpc_index_type_st[0]--> tcl_tpc_index_type_st[0] @@ -18,5 +18,5 @@ memset(&row,0,tableSet->GetRowSize()); row.tptrack_tpsegment = 7; // correlate tptrack and tpsegment tables ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tfspars/tfs_fsctrl.C b/StarDb/tpc/tfspars/tfs_fsctrl.C index 9d0034bc8ee..61ce364cc4d 100644 --- a/StarDb/tpc/tfspars/tfs_fsctrl.C +++ b/StarDb/tpc/tfspars/tfs_fsctrl.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tfspars/tfs_fsctrl Allocated rows: 1 Used rows: 1 Row size: 32 bytes // Table: tfs_fsctrl_st[0]--> tfs_fsctrl_st[0] @@ -42,5 +42,5 @@ memset(&row,0,tableSet->GetRowSize()); row.sprf_ta[1] = 0.637; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tfspars/tfs_fspar.C b/StarDb/tpc/tfspars/tfs_fspar.C index ec41f765fae..1f6df12bd8c 100644 --- a/StarDb/tpc/tfspars/tfs_fspar.C +++ b/StarDb/tpc/tfspars/tfs_fspar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tfspars/tfs_fspar Allocated rows: 1 Used rows: 1 Row size: 160 bytes // Table: tfs_fspar_st[0]--> tfs_fspar_st[0] @@ -23,5 +23,5 @@ memset(&row,0,tableSet->GetRowSize()); row.zbmax = 512; // total time bins ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tidpars/tdeparm.C b/StarDb/tpc/tidpars/tdeparm.C index 7bdc8f9b0be..d6d49c1fefb 100644 --- a/StarDb/tpc/tidpars/tdeparm.C +++ b/StarDb/tpc/tidpars/tdeparm.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tidpars/tdeparm Allocated rows: 1 Used rows: 1 Row size: 60 bytes // Table: tdeparm_st[0]--> tdeparm_st[0] @@ -27,7 +27,7 @@ memset(&row,0,tableSet->GetRowSize()); row.truncfact = 0.3; // fraction of dedx values to truncate ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tidpars/tpipar.C b/StarDb/tpc/tidpars/tpipar.C index 7d84ee55309..7ad6f89975c 100644 --- a/StarDb/tpc/tidpars/tpipar.C +++ b/StarDb/tpc/tidpars/tpipar.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tidpars/tpipar Allocated rows: 1 Used rows: 1 Row size: 132 bytes // Table: tpipar_st[0]--> tpipar_st[0] @@ -44,5 +44,5 @@ memset(&row,0,tableSet->GetRowSize()); row.skew[7] = 0; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.20000217.000000.C b/StarDb/tpc/tptpars/tpt_pars.20000217.000000.C index 03036b1d44b..59c8849f0c9 100644 --- a/StarDb/tpc/tptpars/tpt_pars.20000217.000000.C +++ b/StarDb/tpc/tptpars/tpt_pars.20000217.000000.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.20000301.000005.C b/StarDb/tpc/tptpars/tpt_pars.20000301.000005.C index 03036b1d44b..59c8849f0c9 100644 --- a/StarDb/tpc/tptpars/tpt_pars.20000301.000005.C +++ b/StarDb/tpc/tptpars/tpt_pars.20000301.000005.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.er99.C b/StarDb/tpc/tptpars/tpt_pars.er99.C index f52b4ead8ac..a312ba5843a 100644 --- a/StarDb/tpc/tptpars/tpt_pars.er99.C +++ b/StarDb/tpc/tptpars/tpt_pars.er99.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.sd97.C b/StarDb/tpc/tptpars/tpt_pars.sd97.C index 49af2c46a5e..702f81de730 100644 --- a/StarDb/tpc/tptpars/tpt_pars.sd97.C +++ b/StarDb/tpc/tptpars/tpt_pars.sd97.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.year_1a.C b/StarDb/tpc/tptpars/tpt_pars.year_1a.C index aca0a59f255..feabdc5ac4c 100644 --- a/StarDb/tpc/tptpars/tpt_pars.year_1a.C +++ b/StarDb/tpc/tptpars/tpt_pars.year_1a.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.year_1c.C b/StarDb/tpc/tptpars/tpt_pars.year_1c.C index aca0a59f255..feabdc5ac4c 100644 --- a/StarDb/tpc/tptpars/tpt_pars.year_1c.C +++ b/StarDb/tpc/tptpars/tpt_pars.year_1c.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.year_1h.C b/StarDb/tpc/tptpars/tpt_pars.year_1h.C index aca0a59f255..feabdc5ac4c 100644 --- a/StarDb/tpc/tptpars/tpt_pars.year_1h.C +++ b/StarDb/tpc/tptpars/tpt_pars.year_1h.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_pars.year_2a.C b/StarDb/tpc/tptpars/tpt_pars.year_2a.C index aca0a59f255..feabdc5ac4c 100644 --- a/StarDb/tpc/tptpars/tpt_pars.year_2a.C +++ b/StarDb/tpc/tptpars/tpt_pars.year_2a.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_pars Allocated rows: 2 Used rows: 2 Row size: 160 bytes // Table: tpt_pars_st[0]--> tpt_pars_st[1] @@ -95,5 +95,5 @@ memset(&row,0,tableSet->GetRowSize()); row.lfit = 0; // straigth line fit; tableSet->AddAt(&row,1); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tptpars/tpt_spars.C b/StarDb/tpc/tptpars/tpt_spars.C index fefb6808cbf..188180e7254 100644 --- a/StarDb/tpc/tptpars/tpt_spars.C +++ b/StarDb/tpc/tptpars/tpt_spars.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tptpars/tpt_spars Allocated rows: 1 Used rows: 1 Row size: 216 bytes // Table: tpt_spars_st[0]--> tpt_spars_st[0] @@ -65,5 +65,5 @@ memset(&row,0,tableSet->GetRowSize()); row.outlimit = 4; // ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.19991216.000000.C b/StarDb/tpc/tsspars/tsspar.19991216.000000.C index 6998902a0e7..a0e78312efd 100644 --- a/StarDb/tpc/tsspars/tsspar.19991216.000000.C +++ b/StarDb/tpc/tsspars/tsspar.19991216.000000.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.19991217.000000.C b/StarDb/tpc/tsspars/tsspar.19991217.000000.C index 6998902a0e7..a0e78312efd 100644 --- a/StarDb/tpc/tsspars/tsspar.19991217.000000.C +++ b/StarDb/tpc/tsspars/tsspar.19991217.000000.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.er99.C b/StarDb/tpc/tsspars/tsspar.er99.C index c604d46fbbf..c68b15563ca 100644 --- a/StarDb/tpc/tsspars/tsspar.er99.C +++ b/StarDb/tpc/tsspars/tsspar.er99.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.es99.C b/StarDb/tpc/tsspars/tsspar.es99.C index c604d46fbbf..c68b15563ca 100644 --- a/StarDb/tpc/tsspars/tsspar.es99.C +++ b/StarDb/tpc/tsspars/tsspar.es99.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.sd97.C b/StarDb/tpc/tsspars/tsspar.sd97.C index 085a1b4944c..6653282ea37 100644 --- a/StarDb/tpc/tsspars/tsspar.sd97.C +++ b/StarDb/tpc/tsspars/tsspar.sd97.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.y2018.C b/StarDb/tpc/tsspars/tsspar.y2018.C index a3dc49a4e87..d6370d8e0f8 100644 --- a/StarDb/tpc/tsspars/tsspar.y2018.C +++ b/StarDb/tpc/tsspars/tsspar.y2018.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.y2019.C b/StarDb/tpc/tsspars/tsspar.y2019.C index 6998902a0e7..a0e78312efd 100644 --- a/StarDb/tpc/tsspars/tsspar.y2019.C +++ b/StarDb/tpc/tsspars/tsspar.y2019.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.year_1a.C b/StarDb/tpc/tsspars/tsspar.year_1a.C index a3dc49a4e87..d6370d8e0f8 100644 --- a/StarDb/tpc/tsspars/tsspar.year_1a.C +++ b/StarDb/tpc/tsspars/tsspar.year_1a.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/tsspars/tsspar.year_1c.C b/StarDb/tpc/tsspars/tsspar.year_1c.C index a3dc49a4e87..d6370d8e0f8 100644 --- a/StarDb/tpc/tsspars/tsspar.year_1c.C +++ b/StarDb/tpc/tsspars/tsspar.year_1c.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/tsspars/tsspar Allocated rows: 1 Used rows: 1 Row size: 240 bytes // Table: tss_tsspar_st[0]--> tss_tsspar_st[0] @@ -52,5 +52,5 @@ memset(&row,0,tableSet->GetRowSize()); row.z_laser = 100; // z drift length of pointlaser source(cm) ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarDb/tpc/ttepars/tte_control.C b/StarDb/tpc/ttepars/tte_control.C index 5ae6c585f19..de4ac38fa45 100644 --- a/StarDb/tpc/ttepars/tte_control.C +++ b/StarDb/tpc/ttepars/tte_control.C @@ -1,4 +1,4 @@ -St_DataSet *CreateTable() { +TDataSet *CreateTable() { // ----------------------------------------------------------------- // Top/ttepars/tte_control Allocated rows: 1 Used rows: 1 Row size: 12 bytes // Table: tte_control_st[0]--> tte_control_st[0] @@ -14,5 +14,5 @@ memset(&row,0,tableSet->GetRowSize()); row.res = 0; // Turn on/off calculation of the residuals ; tableSet->AddAt(&row,0); // ----------------- end of code --------------- - return (St_DataSet *)tableSet; + return (TDataSet *)tableSet; } diff --git a/StarVMC/Geometry/StgmGeo/StgmGeo1.xml b/StarVMC/Geometry/StgmGeo/StgmGeo1.xml index 3d213d1f243..decc23be73b 100644 --- a/StarVMC/Geometry/StgmGeo/StgmGeo1.xml +++ b/StarVMC/Geometry/StgmGeo/StgmGeo1.xml @@ -431,19 +431,19 @@ - + - + - +