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

small improve

Browse Source
This commit is contained in:
Ryan Tang 2023-04-04 17:19:20 -04:00
parent fc3a73cd6c
commit aa5580bf25
6 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
armory/EventBuilder.cpp
View File

@ -181,9 +181,9 @@ int main(int argc, char ** argv){
int percentage = count * 100/totNumEvent; int percentage = count * 100/totNumEvent;
if( percentage > last_precentage + 1.0 ) { if( percentage >= last_precentage ) {
printf("Processed : %u, %.0f%% \n\033[A\r", count, count*100./totNumEvent); printf("Processed : %u, %.0f%% \n\033[A\r", count, count*100./totNumEvent);
last_precentage = percentage; last_precentage = percentage + 1.0;
} }
} }

14
armory/GeneralSort.C
View File

@ -81,9 +81,9 @@ Bool_t GeneralSort::Process(Long64_t entry){
if( !isParallel){ if( !isParallel){
processedEntry ++; processedEntry ++;
float percentage = processedEntry*100/NumEntries; float percentage = processedEntry*100/NumEntries;
if( percentage > lastPercentage + 1.0) { if( percentage >= lastPercentage ) {
printf("Processed : %lld, %.0f%% \n\033[A\r", entry, percentage); printf("Processed : %lld, %.0f%% \n\033[A\r", entry, percentage);
lastPercentage = percentage; lastPercentage = percentage + 1.0;
} }
} }
@ -95,7 +95,7 @@ Bool_t GeneralSort::Process(Long64_t entry){
//^############################################################## //^##############################################################
void GeneralSort::Terminate(){ void GeneralSort::Terminate(){
printf("========================= %s\n", __func__); printf("=============================== %s\n", __func__);
DecodeOption(); DecodeOption();
@ -106,7 +106,6 @@ void GeneralSort::Terminate(){
saveFile->Close(); saveFile->Close();
} }
printf("=======================================================\n");
//get entries //get entries
saveFile = TFile::Open(saveFileName); saveFile = TFile::Open(saveFileName);
if( saveFile->IsOpen() ){ if( saveFile->IsOpen() ){
@ -115,9 +114,10 @@ void GeneralSort::Terminate(){
saveFile->Close(); saveFile->Close();
printf("=======================================================\n"); printf("=========================================================================\n");
PrintTraceMethod(); PrintTraceMethod();
printf("----- saved as \033[1;33m%s\033[0m. valid event: %d\n", saveFileName.Data() , validCount); printf("----- saved as \033[1;33m%s\033[0m. valid event: %d\n", saveFileName.Data() , validCount);
printf("=========================================================================\n");
} }
} }
@ -136,14 +136,10 @@ void GeneralSort::Begin(TTree * tree){
} }
void GeneralSort::SlaveBegin(TTree * /*tree*/){ void GeneralSort::SlaveBegin(TTree * /*tree*/){
printf("%s\n", __func__);
} }
void GeneralSort::SlaveTerminate(){ void GeneralSort::SlaveTerminate(){
printf("\n%s\n", __func__);
if( isParallel){ if( isParallel){
printf("%s::SaveTree\n", __func__); printf("%s::SaveTree\n", __func__);
saveFile->cd(); saveFile->cd();

5
armory/GeneralSort.h
View File

@ -253,8 +253,6 @@ void GeneralSort::DecodeOption(){
//^############################################################## //^##############################################################
void GeneralSort::Init(TTree *tree){ void GeneralSort::Init(TTree *tree){
printf("%s\n", __func__);
// Set branch addresses and branch pointers // Set branch addresses and branch pointers
if (!tree) return; if (!tree) return;
fChain = tree; fChain = tree;
@ -299,7 +297,6 @@ void GeneralSort::Init(TTree *tree){
} }
Bool_t GeneralSort::Notify(){ Bool_t GeneralSort::Notify(){
printf("%s\n", __func__);
return kTRUE; return kTRUE;
} }
@ -312,7 +309,7 @@ void GeneralSort::PrintTraceMethod(){
case 2 : traceMethodStr = "Trapezoid"; break; case 2 : traceMethodStr = "Trapezoid"; break;
default: traceMethodStr = "Unknown"; break; default: traceMethodStr = "Unknown"; break;
} }
printf(" Trace method ? %s \n", traceMethodStr); printf("\033[1;33m ===== Trace method ? %s \033[m\n", traceMethodStr);
} }
#endif // #ifdef GeneralSort_cxx #endif // #ifdef GeneralSort_cxx

2
armory/GeneralSortAgent.C
View File

@ -13,7 +13,7 @@ void GeneralSortAgent(Int_t runNum, int nWorker = 1, int traceMethod = -1){
chain->GetListOfFiles()->Print(); chain->GetListOfFiles()->Print();
printf("----------------------------\n"); printf("\033[1;33m---------------------total number of Events %llu\033[0m\n", chain->GetEntries());
//this is the option for TSelector, the first one is traceMethod, 2nd is save fileName; //this is the option for TSelector, the first one is traceMethod, 2nd is save fileName;
TString option; TString option;

3
armory/Process_Download
View File

@ -8,6 +8,9 @@ if [ $# -eq 0 ] || [ $1 == "-help" ]; then
fi; fi;
RUN=$1 RUN=$1
runNum=${RUN#0} #remove zero
RUN=$(printf '%03d' $runNum) ##add back the zero
source $SOLARISANADIR/armory/Process_BasicConfig source $SOLARISANADIR/armory/Process_BasicConfig
source $SOLARISANADIR/working/expName.sh source $SOLARISANADIR/working/expName.sh

4
armory/Process_Run
View File

@ -56,12 +56,14 @@ if [ ${PCID} -eq 1 ]; then
else else
source Process_Download $RUN source Process_Download $RUN
source Process_EventBuilder $RUN $EventBld source Process_EventBuilder $RUN $EventBld $timeWin
fi fi
#################################### GeneralSort #################################### GeneralSort
source Process_Sort $RUN $nWorker $TraceMethod
#################################### Monitor #################################### Monitor