diff --git a/NPAnalysis/Example1/Analysis.cxx b/NPAnalysis/Example1/Analysis.cxx index e8f94ad11d07ed3a979c8111b93c045575ab62b2..0ca09aa68e8e5805a5f6a3426ffcdc28fb8317d5 100644 --- a/NPAnalysis/Example1/Analysis.cxx +++ b/NPAnalysis/Example1/Analysis.cxx @@ -58,7 +58,7 @@ void Analysis::Init(){ Si_X_M2 = 0; Si_Y_M2 = 0; ZTarget = 0; - TargetThickness = m_DetectorManager->GetTargetThickness(); + TargetThickness = m_DetectorManager->GetTargetThickness()*micrometer; // Energy loss table: the G4Table are generated by the simulation He3CD2 = EnergyLoss("He3_CD2.G4table","G4Table",100 ); He3Al = EnergyLoss("He3_Al.G4table","G4Table",10); @@ -80,6 +80,7 @@ void Analysis::TreatEvent(){ // Beam energy is measured using F3 and F2 plastic TOF double BeamEnergy = Rand.Gaus(Initial->GetIncidentInitialKineticEnergy(),4.5); BeamEnergy = Li11CD2.Slow(BeamEnergy,TargetThickness/2.,0); + He10Reaction->SetBeamEnergy(BeamEnergy); //////////////////////////// LOOP on MUST2 + SSSD Hit ////////////////// for(unsigned int countSSSD = 0 ; countSSSD < SSSD->Energy.size() ; countSSSD++){ @@ -158,13 +159,15 @@ void Analysis::TreatEvent(){ /************************************************/ // Part 3 : Excitation Energy Calculation Ex = He10Reaction -> ReconstructRelativistic( ELab , ThetaLab ); - ThetaLab=ThetaLab/deg; /************************************************/ + /************************************************/ // Part 4 : Theta CM Calculation - ThetaCM = He10Reaction -> EnergyLabToThetaCM( ELab , 0)/deg; + ThetaCM = He10Reaction -> EnergyLabToThetaCM( ELab , ThetaLab)/deg; + ThetaLab=ThetaLab/deg; /************************************************/ + } } //end loop SSSD }//end loop MUST2 diff --git a/NPAnalysis/Example1/ShowResult.C b/NPAnalysis/Example1/ShowResult.C index d425115dbe40120a55f108c385842d2d9810adb6..0a734b2a1a9c5f772af4201ec44b935a9cb34182 100644 --- a/NPAnalysis/Example1/ShowResult.C +++ b/NPAnalysis/Example1/ShowResult.C @@ -16,7 +16,7 @@ EDE= (TCutG*) File_EDE->FindObjectAny("EDE"); //////////////////////////////////////////////////////////////////////////////// void LoadChain(){ -chain = new TChain("ResultTree"); +chain = new TChain("PhysicsTree"); chain->Add("../../Outputs/Analysis/Example1.root"); } @@ -41,7 +41,8 @@ ETOF->Draw("same"); // Kinematical Line // c1->cd(3); -chain->Draw("ELab:ThetaLab>>hKine(500,0,45,400,0,40)","MUST2.CsI_E<0 && MUST2.TelescopeNumber<5 && EDE && ETOF","colz"); +//chain->Draw("ELab:ThetaLab>>hKine(500,0,45,400,0,40)","MUST2.CsI_E<0 && MUST2.TelescopeNumber<5 && EDE && ETOF","colz"); +chain->Draw("ELab:ThetaLab","MUST2.CsI_E<0 && MUST2.TelescopeNumber<5 && EDE && ETOF","colz"); NPL::Reaction r("11Li(d,3He)10He@553"); r.SetExcitationHeavy(1.4); diff --git a/NPAnalysis/Example1/configs/ConfigMust2.dat b/NPAnalysis/Example1/configs/ConfigMust2.dat index 2c36d1d62aba8284349f5afb674c5f63153299da..bcbc385cb42bc8a1e67a654e1877530ce21787f9 100755 --- a/NPAnalysis/Example1/configs/ConfigMust2.dat +++ b/NPAnalysis/Example1/configs/ConfigMust2.dat @@ -1,26 +1,19 @@ ConfigMust2 MAX_STRIP_MULTIPLICITY 1 STRIP_ENERGY_MATCHING_NUMBER_OF_SIGMA 5 - STRIP_ENERGY_MATCHING_SIGMA 0.02 + STRIP_ENERGY_MATCHING_SIGMA 0.02 DISABLE_CHANNEL MM1STRY12 DISABLE_CHANNEL MM2STRY12 DISABLE_CHANNEL MM3STRY12 DISABLE_CHANNEL MM4STRY12 DISABLE_CHANNEL MM1STRX12 - DISABLE_CHANNEL MM2STRX12 - DISABLE_CHANNEL MM3STRX12 - DISABLE_CHANNEL MM4STRX12 - DISABLE_CHANNEL MM1STRY124 - DISABLE_CHANNEL MM4STRX3 - DISABLE_CHANNEL MM4STRX4 - DISABLE_CHANNEL MM4STRX5 - DISABLE_CHANNEL MM4STRX6 - DISABLE_CHANNEL MM4STRX8 - DISABLE_CHANNEL MM4STRX31 + DISABLE_CHANNEL MM2STRX12 + DISABLE_CHANNEL MM3STRX12 + DISABLE_CHANNEL MM4STRX12 DISABLE_ALL MM5 DISABLE_ALL MM6 DISABLE_ALL MM7 DISABLE_ALL MM8 SI_X_E_RAW_THRESHOLD 0 - CSI_E_RAW_THRESHOLD 0 - CSI_SIZE 256 + CSI_E_RAW_THRESHOLD 0 + CSI_SIZE 256