diff --git a/Inputs/EventGenerator/30Pdp.reaction b/Inputs/EventGenerator/30Pdp.reaction index 21711e4be4061d069148c9a02d09a4587bd94248..5dc8fbdbc30db63601beef6276d3a14858578ffd 100644 --- a/Inputs/EventGenerator/30Pdp.reaction +++ b/Inputs/EventGenerator/30Pdp.reaction @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%%%%%%%%% Reaction file for 3He(25Al,d)26Al reaction %%%%%%%%% +%%%%%%%%%%% Reaction file for 30P(d,p)31P reaction %%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Beam Particle= 30P @@ -21,7 +21,7 @@ TwoBodyReaction Heavy= 31P ExcitationEnergyHeavy= 6.3 ExcitationEnergyLight= 0.0 - CrossSectionPath= flat.txt CS + CrossSectionPath= 30Pdp_6MeV_l=0 CS %flat.txt CS ShootLight= 1 ShootHeavy= 0 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/NPAnalysis/macros/GeometricalEfficiency.C b/NPAnalysis/macros/GeometricalEfficiency.C index dd7fa54c94d29af82902a0f35b70cdc066b8506e..843843e63dc4bc81ac2ce3d4080fc581be289048 100644 --- a/NPAnalysis/macros/GeometricalEfficiency.C +++ b/NPAnalysis/macros/GeometricalEfficiency.C @@ -86,6 +86,13 @@ void GeometricalEfficiency(const char * fname = "myResult"){ hDetecThetaCM->Fill(initCond->GetThetaCM(0)); } } + + hEmittTheta->Sumw2(); + hEmittThetaCM->Sumw2(); + hDetecTheta->Sumw2(); + hDetecThetaCM->Sumw2(); + + TCanvas *c0 = new TCanvas("c0", "Distrib",800,800); hEmittTheta->Draw(""); hDetecTheta->Draw("same"); diff --git a/NPLib/Calibration/NPSiliconCalibrator.cxx b/NPLib/Calibration/NPSiliconCalibrator.cxx index e0503484b90b9bba88fffded3fb56053d2835356..cb77a079043bcb9152fafbe6ff84389df7e4c1b9 100644 --- a/NPLib/Calibration/NPSiliconCalibrator.cxx +++ b/NPLib/Calibration/NPSiliconCalibrator.cxx @@ -186,7 +186,7 @@ TGraphErrors* NPL::SiliconCalibrator::FitSpectrum(TH1* histo){ TSpectrum* sp = new TSpectrum(4,1); Int_t nfound = 0; nfound = sp->Search(histo,3,"",0.25); - double* xpeaks = sp->GetPositionX(); + float* xpeaks = sp->GetPositionX(); if(nfound>1){ for(Int_t p=0;p<nfound;p++){ diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx index d4cf5d4a98bde01491d59e5d61f213ddffa8ad8e..bf3bd703d9695604d9263c2fe4508cad4ea985b7 100644 --- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx +++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx @@ -734,7 +734,7 @@ for(unsigned int k = 0 ; k < sizeB ; k++){ public: brlproxy(){ NPL::DetectorFactory::getInstance()->AddToken("Tiara","Tiara"); - NPL::DetectorFactory::getInstance()->AddDetector("TiaraBarrel",TTiaraBarrelPhysics::Construct); + NPL::DetectorFactory::getInstance()->AddDetector("TiaraInnerBarrel=",TTiaraBarrelPhysics::Construct); } };