rtang/SOLARIS_Analysis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some UI improvement

Browse Source
This commit is contained in:
Ryan Tang 2023-04-07 18:37:40 -04:00
parent e6c6620426
commit 2d44063e56
6 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
armory/Process_EventBuilder
View File

@ -91,7 +91,8 @@ elif [ ${EventBld} -ge 1 ]; then
else else
echo -e "${GREEN} root data are newer than raw data. No need to merged again.${NC}" 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 fi
else else

11
armory/Process_Run
View File

@ -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 " 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 " Monitor = 2/1/0 || 1 = single run, 2 = using the list in ChainMonitors.C"
echo "" 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 " * Defult timeWindow for Event builder is 100 tick = 800 ns."
echo "" echo ""
exit 1 exit 1
@ -30,7 +30,7 @@ runNum=$1
EventBld=2 EventBld=2
nWorker=1 nWorker=1
TraceMethod=-1 TraceMethod=-1
isMonitor=0 isMonitor=1
if [ $# -ge 2 ]; then EventBld=$2; fi if [ $# -ge 2 ]; then EventBld=$2; fi
if [ $# -ge 3 ]; then nWorker=$3; fi if [ $# -ge 3 ]; then nWorker=$3; fi
@ -81,6 +81,13 @@ if [ $isRunDataExist ]; then
fi fi
#################################### Monitor #################################### 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

9
armory/Process_Sort
View File

@ -76,13 +76,14 @@ else
if [ $rootDataTime -ge $genRootDataTime ]; then 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)" 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 else
echo -e "${GREEN}gen_run$RUN.root is newer than run$RUN.root. No need to GeneralSort again.${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 "${GREEN} You can Force GeneralSort using option -${nWorker}, ${ORANGE} see Process_Run -help${NC}"
echo -e "${LRED}>>>>>>>>>>>>>>>>>>>>> GeneralSort Skipped. ${NC}"
fi fi
fi fi

4
working/ChainMonitors.C
View File

@ -37,7 +37,7 @@ void ChainMonitors(int RUNNUM = -1, int RUNNUM2 = -1) {
printf("\033[0;31m========================================== Number of Files : %2d\n",fileList->GetEntries()); printf("\033[0;31m========================================== Number of Files : %2d\n",fileList->GetEntries());
fileList->Print(); fileList->Print();
printf("========================================== Number of Files : %2d\033[0m\n",fileList->GetEntries()); 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; double totDuration = 0;
std::vector<ULong64_t> startTime; std::vector<ULong64_t> startTime;
@ -70,8 +70,6 @@ void ChainMonitors(int RUNNUM = -1, int RUNNUM2 = -1) {
TString title = "Run:" + create_range_string(runList); TString title = "Run:" + create_range_string(runList);
title += Form(" | %.0f min", totDuration/60.) ; title += Form(" | %.0f min", totDuration/60.) ;
printf("%s\n", title.Data());
//Some input to TSelector //Some input to TSelector
Monitor * selector = new Monitor(); Monitor * selector = new Monitor();
selector->SetCanvasTitle(title); selector->SetCanvasTitle(title);

10
working/Monitor.C
View File

@ -185,11 +185,11 @@ void Monitor::Begin(TTree *tree){
AnalysisLib::LoadRDTCorr(); AnalysisLib::LoadRDTCorr();
AnalysisLib::LoadReactionParas(true); AnalysisLib::LoadReactionParas(true);
if( (int) AnalysisLib::xnCorr.size() < mapping::NARRAY ) { isXNCorrOK = false; printf("!!!!!!!! size of xnCorr < NARRAY .\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::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::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::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::rdtCorr.size() < mapping::NRDT ) { isRDTCorrOK = false; printf(" !!!!!!!! size of rdtCorr < NRDT .\n"); }
numRow = AnalysisLib::detGeo.nDet; numRow = AnalysisLib::detGeo.nDet;
numCol = mapping::NARRAY/numRow; numCol = mapping::NARRAY/numRow;

4
working/Monitor.h
View File

@ -274,7 +274,7 @@ template<typename T> void Monitor::CreateListOfHist1D(T ** &histList,
const char * TitleForm, const char * TitleForm,
int binX, float xMin, float xMax){ int binX, float xMin, float xMax){
//printf(" Making %d of %s.\n", size, namePrefix);
histList = new T * [size]; 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); 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<typename T> void Monitor::CreateListOfHist2D(T ** &histList,
int binX, float xMin, float xMax, int binX, float xMin, float xMax,
int binY, float yMin, float yMax){ int binY, float yMin, float yMax){
//printf(" Making %d of %s.\n", size, namePrefix);
histList = new T * [size]; 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); 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);
} }