diff --git a/Projects/e870/.DS_Store b/Projects/e870/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..f5ddf34afd94504d47c0de268f5e147d9a740da6 100644 Binary files a/Projects/e870/.DS_Store and b/Projects/e870/.DS_Store differ diff --git a/Projects/e870/Analysis.cxx b/Projects/e870/Analysis.cxx index 3bbcd6c026efa3c0eff12eba35b1c68daf9c31ba..db027a980e60e9255dd3a01b51a7321385f2d95f 100644 --- a/Projects/e870/Analysis.cxx +++ b/Projects/e870/Analysis.cxx @@ -147,7 +147,7 @@ void Analysis::TreatEvent() { ThetaM2Surface = 0; ThetaNormalTarget = 0; TVector3 HitDirection = M2->GetPositionOfInteraction(countMust2) - BeamImpact; - ThetaLab = HitDirection.Angle(BeamDirection); + double Theta = HitDirection.Angle(BeamDirection); X = M2->GetPositionOfInteraction(countMust2).X(); Y = M2->GetPositionOfInteraction(countMust2).Y(); @@ -182,12 +182,10 @@ void Analysis::TreatEvent() { // Target Correction Energy = LightTarget.EvaluateInitialEnergy(Energy, TargetThickness * 0.5, ThetaNormalTarget); - ELab = Energy; - /************************************************/ - // Part 3 : Excitation Energy Calculation - Ex = reaction.ReconstructRelativistic(ELab, ThetaLab); - // ExNoBeam = reaction.ReconstructRelativistic(, ThetaLab); - ThetaLab = ThetaLab / deg; + // What is written in the tree + ThetaLab.push_back(Theta / deg); + Ex.push_back(reaction.ReconstructRelativistic(Energy, Theta)); + ELab.push_back(Energy); /************************************************/ } // end loop MUST2 @@ -197,9 +195,9 @@ void Analysis::TreatEvent() { void Analysis::End() {} //////////////////////////////////////////////////////////////////////////////// void Analysis::InitOutputBranch() { - RootOutput::getInstance()->GetTree()->Branch("Ex", &Ex, "Ex/D"); - RootOutput::getInstance()->GetTree()->Branch("ELab", &ELab, "ELab/D"); - RootOutput::getInstance()->GetTree()->Branch("ThetaLab", &ThetaLab, "ThetaLab/D"); + RootOutput::getInstance()->GetTree()->Branch("Ex", &Ex); + RootOutput::getInstance()->GetTree()->Branch("ELab", &ELab); + RootOutput::getInstance()->GetTree()->Branch("ThetaLab", &ThetaLab); RootOutput::getInstance()->GetTree()->Branch("ThetaCM", &ThetaCM, "ThetaCM/D"); RootOutput::getInstance()->GetTree()->Branch("Run", &Run, "Run/I"); RootOutput::getInstance()->GetTree()->Branch("X", &X, "X/D"); @@ -231,17 +229,17 @@ void Analysis::InitInputBranch() { } //////////////////////////////////////////////////////////////////////////////// void Analysis::ReInitValue() { - Ex = -1000; ExNoBeam = ExNoProton = -1000; EDC = -1000; - ELab = -1000; BeamEnergy = -1000; - ThetaLab = -1000; ThetaCM = -1000; X = -1000; Y = -1000; Z = -1000; dE = -1000; + ELab.clear(); + ThetaLab.clear(); + Ex.clear(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/Projects/e870/Analysis.h b/Projects/e870/Analysis.h index 0e2b54fce678f699a586547b0411cea672044e28..450e560cbbfbdb7f318a4c2194bad69af6204108 100644 --- a/Projects/e870/Analysis.h +++ b/Projects/e870/Analysis.h @@ -51,12 +51,12 @@ class Analysis: public NPL::VAnalysis{ static NPL::VAnalysis* Construct(); private: - double Ex; + std::vector<double>Ex; double ExNoBeam; double ExNoProton; double EDC; - double ELab; - double ThetaLab; + std::vector<double> ELab; + std::vector<double> ThetaLab; double ThetaCM; double OriginalELab; double OriginalThetaLab; diff --git a/Projects/e870/discussions/DecemberDiscussions.pptx b/Projects/e870/discussions/DecemberDiscussions.pptx new file mode 100644 index 0000000000000000000000000000000000000000..f82d98dadd8aa3792b5f65a1d025a37f75cba4a0 Binary files /dev/null and b/Projects/e870/discussions/DecemberDiscussions.pptx differ diff --git a/Projects/e870/discussions/ToDoList081223.pptx b/Projects/e870/discussions/ToDoList081223.pptx new file mode 100644 index 0000000000000000000000000000000000000000..d98f336b533240e881d03961b58ae0bdc1aec467 Binary files /dev/null and b/Projects/e870/discussions/ToDoList081223.pptx differ diff --git a/Projects/e870/launch_simu.sh b/Projects/e870/launch_simu.sh index 9005ba4a2f61168db03b0c9e79258597071a5b67..8a4e26f9bece1ce6a766a4e89f21533b3d3c03a4 100755 --- a/Projects/e870/launch_simu.sh +++ b/Projects/e870/launch_simu.sh @@ -45,9 +45,9 @@ # # Compile the local analysis: # # make # All of the above: -npcompilation +# npcompilation -npsimulation -D DetectorConfiguration/MUGAST_LISE.detector -E reaction/10Bepalpha.reaction -O test -B run.mac +# npsimulation -D DetectorConfiguration/MUGAST_LISE.detector -E reaction/10Bepalpha.reaction -O test -B run.mac npanalysis -D DetectorConfiguration/MUGAST_LISE.detector -E reaction/10Bepalpha.reaction -T $NPTOOL/Outputs/Simulation/test.root SimulatedTree -O test