diff --git a/armory/Process_EventBuilder b/armory/Process_EventBuilder index 1e55bf7..942808c 100755 --- a/armory/Process_EventBuilder +++ b/armory/Process_EventBuilder @@ -91,7 +91,8 @@ elif [ ${EventBld} -ge 1 ]; then else echo -e "${GREEN} root data are newer than raw data. No need to merged again.${NC}" - echo -e "${GREEN}You can Force merging using option -${EventBld}, ${ORANGE} see ./process_run.sh -help${NC}" + echo -e "${GREEN} You can Force merging using option -${EventBld}, ${ORANGE} see ./process_run.sh -help${NC}" + echo -e "${LRED}>>>>>>>>>>>>>>>>>>>>> Event Building Skipped. ${NC}" fi else diff --git a/armory/Process_Run b/armory/Process_Run index 9cbf036..59a5398 100755 --- a/armory/Process_Run +++ b/armory/Process_Run @@ -18,7 +18,7 @@ if [ $# -eq 0 ] || [ $1 == "-help" ]; then echo " TraceMethod = -1/0/1/2 || -1 no trace, 0 save trace, 1 fit, 2 trapezoid(not implemented)" echo " Monitor = 2/1/0 || 1 = single run, 2 = using the list in ChainMonitors.C" echo "" - echo " * negative option = force (except for TraceMethod)." + echo " * negative option = force (except for TraceMethod and Monitor)." echo " * Defult timeWindow for Event builder is 100 tick = 800 ns." echo "" exit 1 @@ -30,7 +30,7 @@ runNum=$1 EventBld=2 nWorker=1 TraceMethod=-1 -isMonitor=0 +isMonitor=1 if [ $# -ge 2 ]; then EventBld=$2; fi if [ $# -ge 3 ]; then nWorker=$3; fi @@ -81,6 +81,13 @@ if [ $isRunDataExist ]; then fi #################################### Monitor +if [ $isMonitor -eq 0 ]; then + echo -e "${LRED}>>>>>>>>>>>>>>>>>>>>> Monitor Skipped by user. ${NC}" +elif [ $isMonitor -eq 1 ]; then + root -l "ChainMonitors.C($RUN)" +elif [ $isMonitor -eq 2 ]; then + root -l "ChainMonitors.C" +fi diff --git a/armory/Process_Sort b/armory/Process_Sort index 8ee7a22..a397393 100755 --- a/armory/Process_Sort +++ b/armory/Process_Sort @@ -76,13 +76,14 @@ else if [ $rootDataTime -ge $genRootDataTime ]; then - echo -e "${LRED}>>>>>>>>>>>>>>>>>>>>> Event Building $(date) ${NC}" + echo -e "${LRED}>>>>>>>>>>>>>>>>>>>>> GeneralSort $(date) ${NC}" root -l -q -b "$SOLARISANADIR/armory/GeneralSortAgent.C($runNum, $nWorker, $TraceMethod)" - echo -e "${LRED}<<<<<<<<<<<<<<<< Done Event Building $(date) ${NC}" + echo -e "${LRED}<<<<<<<<<<<<<<<< Done GeneralSort $(date) ${NC}" else - echo -e "${GREEN}gen_run$RUN.root is newer than run$RUN.root. No need to GeneralSort again.${NC}" - echo -e "${GREEN}You can Force GeneralSort using option -${nWorker}, ${ORANGE} see Process_Run -help${NC}" + echo -e "${GREEN} gen_run$RUN.root is newer than run$RUN.root. No need to GeneralSort again.${NC}" + echo -e "${GREEN} You can Force GeneralSort using option -${nWorker}, ${ORANGE} see Process_Run -help${NC}" + echo -e "${LRED}>>>>>>>>>>>>>>>>>>>>> GeneralSort Skipped. ${NC}" fi fi diff --git a/working/ChainMonitors.C b/working/ChainMonitors.C index 004c2f1..c53b661 100644 --- a/working/ChainMonitors.C +++ b/working/ChainMonitors.C @@ -37,7 +37,7 @@ void ChainMonitors(int RUNNUM = -1, int RUNNUM2 = -1) { printf("\033[0;31m========================================== Number of Files : %2d\n",fileList->GetEntries()); fileList->Print(); printf("========================================== Number of Files : %2d\033[0m\n",fileList->GetEntries()); - printf(" number of entries : %llu \n", chain->GetEntries()); + printf("---------------------------------- Total Number of entries : %llu \n", chain->GetEntries()); double totDuration = 0; std::vector startTime; @@ -69,8 +69,6 @@ void ChainMonitors(int RUNNUM = -1, int RUNNUM2 = -1) { std::sort(runList.begin(), runList.end()); TString title = "Run:" + create_range_string(runList); title += Form(" | %.0f min", totDuration/60.) ; - - printf("%s\n", title.Data()); //Some input to TSelector Monitor * selector = new Monitor(); diff --git a/working/Monitor.C b/working/Monitor.C index c61fe49..2517016 100644 --- a/working/Monitor.C +++ b/working/Monitor.C @@ -185,11 +185,11 @@ void Monitor::Begin(TTree *tree){ AnalysisLib::LoadRDTCorr(); AnalysisLib::LoadReactionParas(true); - if( (int) AnalysisLib::xnCorr.size() < mapping::NARRAY ) { isXNCorrOK = false; printf("!!!!!!!! size of xnCorr < NARRAY .\n"); } - if( (int) AnalysisLib::xfxneCorr.size() < mapping::NARRAY ) { isXFXNCorrOK = false; printf("!!!!!!!! size of xfxneCorr < NARRAY .\n"); } - if( (int) AnalysisLib::eCorr.size() < mapping::NARRAY ) { isXScaleCorrOK = false; printf("!!!!!!!! size of eCorr < NARRAY .\n"); } - if( (int) AnalysisLib::xScale.size() < mapping::NARRAY ) { isECorrOK = false; printf("!!!!!!!! size of xScale < NARRAY .\n"); } - if( (int) AnalysisLib::rdtCorr.size() < mapping::NRDT ) { isRDTCorrOK = false; printf("!!!!!!!! size of rdtCorr < NRDT .\n"); } + if( (int) AnalysisLib::xnCorr.size() < mapping::NARRAY ) { isXNCorrOK = false; printf(" !!!!!!!! size of xnCorr < NARRAY .\n"); } + if( (int) AnalysisLib::xfxneCorr.size() < mapping::NARRAY ) { isXFXNCorrOK = false; printf(" !!!!!!!! size of xfxneCorr < NARRAY .\n"); } + if( (int) AnalysisLib::eCorr.size() < mapping::NARRAY ) { isXScaleCorrOK = false; printf(" !!!!!!!! size of eCorr < NARRAY .\n"); } + if( (int) AnalysisLib::xScale.size() < mapping::NARRAY ) { isECorrOK = false; printf(" !!!!!!!! size of xScale < NARRAY .\n"); } + if( (int) AnalysisLib::rdtCorr.size() < mapping::NRDT ) { isRDTCorrOK = false; printf(" !!!!!!!! size of rdtCorr < NRDT .\n"); } numRow = AnalysisLib::detGeo.nDet; numCol = mapping::NARRAY/numRow; diff --git a/working/Monitor.h b/working/Monitor.h index 409234c..4708ae4 100644 --- a/working/Monitor.h +++ b/working/Monitor.h @@ -274,7 +274,7 @@ template void Monitor::CreateListOfHist1D(T ** &histList, const char * TitleForm, int binX, float xMin, float xMax){ - + //printf(" Making %d of %s.\n", size, namePrefix); histList = new T * [size]; for(int i = 0; i < size; i++) histList[i] = new T(Form("%s%d", namePrefix, i), Form(TitleForm, i), binX, xMin, xMax); } @@ -286,7 +286,7 @@ template void Monitor::CreateListOfHist2D(T ** &histList, int binX, float xMin, float xMax, int binY, float yMin, float yMax){ - + //printf(" Making %d of %s.\n", size, namePrefix); histList = new T * [size]; for(int i = 0; i < size; i++) histList[i] = new T(Form("%s%d", namePrefix, i), Form(TitleForm, i), binX, xMin, xMax, binY, yMin, yMax); }