Skip to content
Snippets Groups Projects
Commit 985389c3 authored by Theodore Efremov's avatar Theodore Efremov :hibiscus:
Browse files

Modified organisation

parent c93ba9a3
No related branches found
No related tags found
1 merge request!27Draft: [Epic] Preparation of the environement for the new GaseousDetectorScorers...
Pipeline #370597 passed
...@@ -494,7 +494,7 @@ void Analysis::VamosAnalysis(){ ...@@ -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}; 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 // To know time of electron drift in a section of the chio
for (int seg = 0 ; seg < IC->fIC_TS.size() ; seg++){ 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]; FF_T13 = - MTOF_FP0_T0V[0] + Toff[FPMWPat];
......
...@@ -142,7 +142,7 @@ class Analysis: public NPL::VAnalysis{ ...@@ -142,7 +142,7 @@ class Analysis: public NPL::VAnalysis{
double FF_M13; double FF_M13;
double FF_Mass13; double FF_Mass13;
double FF_Etot13; double FF_Etot13;
vector<long> FF_DriftTime; vector<double> FF_DriftTime;
double Exo_cosa; double Exo_cosa;
double Exo_E; double Exo_E;
......
...@@ -3,4 +3,4 @@ echo "- executing snakemake file for npanalysis..." ...@@ -3,4 +3,4 @@ echo "- executing snakemake file for npanalysis..."
snakemake --cores 30 --forceall --keep-incomplete --keep-going --rerun-incomplete snakemake --cores 30 --forceall --keep-incomplete --keep-going --rerun-incomplete
echo "- snakemake executed successfully!" echo "- snakemake executed successfully!"
echo "- Merging file..." 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_")'
Project e850 Project e850
%AnalysisOutput= ../../../../../../../../../ AnalysisOutput= ../../../../../../../../../
AnalysisOutput= ./root/analysis %AnalysisOutput= ./root/analysis
SimulationOutput= ./root/simulation SimulationOutput= ./root/simulation
EnergyLoss= ./EnergyLossTable EnergyLoss= ./EnergyLossTable
...@@ -11,7 +11,7 @@ void Merger(int N, const char* outputDir, const char* outputFileName, const char ...@@ -11,7 +11,7 @@ void Merger(int N, const char* outputDir, const char* outputFileName, const char
continue; continue;
} }
merger.AddFile(fileName); // Add file to the merger merger.AddFile(fileName); // Add file to the merger
cout << "Added file " << fileName << endl;
// Display progress // Display progress
int progress = ((i + 1) * 100) / N; int progress = ((i + 1) * 100) / N;
std::cout << "\rMerging files: " << progress << "% complete." << std::flush; std::cout << "\rMerging files: " << progress << "% complete." << std::flush;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment