diff --git a/Projects/AlPhaPha/2024/Analysis.cxx b/Projects/AlPhaPha/2024/Analysis.cxx index 679ae7fffa73e4762978a36e2bb72f8ecf60bdbb..0008109e5a9fc13698e462588b8e6bba7ff5a6cc 100644 --- a/Projects/AlPhaPha/2024/Analysis.cxx +++ b/Projects/AlPhaPha/2024/Analysis.cxx @@ -494,7 +494,7 @@ void Analysis::VamosAnalysis(){ double Toff[20] = {0, 588.0, 588.5, 587.95, 588.04, 587.72, 587.92, 587.9, 587.9, 588.66, 588.80, 588.67, 588.64, 588.75, 588.47, 588.65, 588.65, 588.67, 589.05, 590.3}; // To know time of electron drift in a section of the chio for (int seg = 0 ; seg < IC->fIC_TS.size() ; seg++){ - FF_DriftTime.push_back( (IC->fIC_TS.at(seg) - Time->GetTS_MWPC14(0) - (Time->GetTime_MWPC14(0) - Toff[FPMW_Section]))); + FF_DriftTime.push_back(10* (IC->fIC_TS.at(seg) - Time->GetTS_MWPC13(0) - (Time->GetTime_MWPC14(0) -Time->GetTime_MWPC13(0)))); } FF_T13 = - MTOF_FP0_T0V[0] + Toff[FPMWPat]; diff --git a/Projects/AlPhaPha/2024/Analysis.h b/Projects/AlPhaPha/2024/Analysis.h index 29d6fa77e1507ee5966e8bad3707358ad78eeac3..23009fd59df229da305c3183b6b08f5fa170df01 100644 --- a/Projects/AlPhaPha/2024/Analysis.h +++ b/Projects/AlPhaPha/2024/Analysis.h @@ -142,7 +142,7 @@ class Analysis: public NPL::VAnalysis{ double FF_M13; double FF_Mass13; double FF_Etot13; - vector<long> FF_DriftTime; + vector<double> FF_DriftTime; double Exo_cosa; double Exo_E; diff --git a/Projects/AlPhaPha/2024/convert_snakemake_generic.sh b/Projects/AlPhaPha/2024/convert_snakemake_generic.sh index bf228e97a5217a5cb789bbb23eab9d0c3c3a5668..7ead632c0d8a841894512a0d7f58ade995a08f5e 100755 --- a/Projects/AlPhaPha/2024/convert_snakemake_generic.sh +++ b/Projects/AlPhaPha/2024/convert_snakemake_generic.sh @@ -3,4 +3,4 @@ echo "- executing snakemake file for npanalysis..." snakemake --cores 30 --forceall --keep-incomplete --keep-going --rerun-incomplete echo "- snakemake executed successfully!" echo "- Merging file..." -root -q '../DataMacro/Merger.C(30,"root/analysis","VamosCalib247","../DataMacro/output/analysis/run_raw_247_")' +root -q '../DataMacro/Merger.C(30,"root/analysis","VamosCalib247","../DataMacro/output/analysis/run_247/run_raw_247_")' diff --git a/Projects/AlPhaPha/2024/macro/mwpc/HistoPosFiller.cxx b/Projects/AlPhaPha/2024/macro/mwpc/Linearisation/HistoPosFiller.cxx similarity index 100% rename from Projects/AlPhaPha/2024/macro/mwpc/HistoPosFiller.cxx rename to Projects/AlPhaPha/2024/macro/mwpc/Linearisation/HistoPosFiller.cxx diff --git a/Projects/AlPhaPha/2024/macro/mwpc/LinearisationTransfo.cxx b/Projects/AlPhaPha/2024/macro/mwpc/Linearisation/LinearisationTransfo.cxx similarity index 100% rename from Projects/AlPhaPha/2024/macro/mwpc/LinearisationTransfo.cxx rename to Projects/AlPhaPha/2024/macro/mwpc/Linearisation/LinearisationTransfo.cxx diff --git a/Projects/AlPhaPha/2024/macro/mwpc/LinearisationTxt.cxx b/Projects/AlPhaPha/2024/macro/mwpc/Linearisation/LinearisationTxt.cxx similarity index 100% rename from Projects/AlPhaPha/2024/macro/mwpc/LinearisationTxt.cxx rename to Projects/AlPhaPha/2024/macro/mwpc/Linearisation/LinearisationTxt.cxx diff --git a/Projects/AlPhaPha/2024/macro/mwpc/ReadMe.md b/Projects/AlPhaPha/2024/macro/mwpc/Linearisation/ReadMe.md similarity index 100% rename from Projects/AlPhaPha/2024/macro/mwpc/ReadMe.md rename to Projects/AlPhaPha/2024/macro/mwpc/Linearisation/ReadMe.md diff --git a/Projects/AlPhaPha/2024/project.config b/Projects/AlPhaPha/2024/project.config index 685928aff9996c09fcd64ff7131a6f187082589e..b3a6c3e89cba9bba28d7917e6bbcaa0ca72c6549 100644 --- a/Projects/AlPhaPha/2024/project.config +++ b/Projects/AlPhaPha/2024/project.config @@ -1,6 +1,6 @@ Project e850 - %AnalysisOutput= ../../../../../../../../../ - AnalysisOutput= ./root/analysis + AnalysisOutput= ../../../../../../../../../ + %AnalysisOutput= ./root/analysis SimulationOutput= ./root/simulation EnergyLoss= ./EnergyLossTable diff --git a/Projects/AlPhaPha/DataMacro/Merger.C b/Projects/AlPhaPha/DataMacro/Merger.C index aea1e96403ffeb705ed143b8440f7f0de18f75c5..66c65707a18abfc391fc2071159fa1789e034faf 100644 --- a/Projects/AlPhaPha/DataMacro/Merger.C +++ b/Projects/AlPhaPha/DataMacro/Merger.C @@ -11,7 +11,7 @@ void Merger(int N, const char* outputDir, const char* outputFileName, const char continue; } merger.AddFile(fileName); // Add file to the merger - + cout << "Added file " << fileName << endl; // Display progress int progress = ((i + 1) * 100) / N; std::cout << "\rMerging files: " << progress << "% complete." << std::flush;