diff --git a/NPLib/Physics/NPBeam.cxx b/NPLib/Physics/NPBeam.cxx index 608a9255c80da2ca09b538724a8d3d3949ac0fa0..edd0a557283470972197d3c4d3f4fe9f6fbe649c 100644 --- a/NPLib/Physics/NPBeam.cxx +++ b/NPLib/Physics/NPBeam.cxx @@ -124,7 +124,7 @@ void Beam::ReadConfigurationFile(string Path){ //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo...... void Beam::ReadConfigurationFile(NPL::InputParser parser){ vector<NPL::InputBlock*> blocks = parser.GetAllBlocksWithToken("Beam"); - if(NPOptionManager::getInstance()->GetVerboseLevel()) + if(blocks.size()>0 && NPOptionManager::getInstance()->GetVerboseLevel()) cout << endl << "\033[1;35m//// Beam found " << endl; vector<string> token = {"Particle"}; diff --git a/NPLib/Physics/NPReaction.cxx b/NPLib/Physics/NPReaction.cxx index ce5b6119a1e953704db6623cd0de5a1beac24ae1..e8a7496fb0b10fa7cc42930ee8c4ef4bbd792924 100644 --- a/NPLib/Physics/NPReaction.cxx +++ b/NPLib/Physics/NPReaction.cxx @@ -315,7 +315,7 @@ void Reaction::ReadConfigurationFile(string Path){ void Reaction::ReadConfigurationFile(NPL::InputParser parser){ vector<NPL::InputBlock*> blocks = parser.GetAllBlocksWithToken("TwoBodyReaction"); - if(NPOptionManager::getInstance()->GetVerboseLevel()) + if(blocks.size()>0 && NPOptionManager::getInstance()->GetVerboseLevel()) cout << endl << "\033[1;35m//// Two body reaction found " << endl; vector<string> token1 = {"Beam","Target","Light","Heavy"}; diff --git a/Projects/BeLise/13Be.reaction b/Projects/BeLise/13Be.reaction index dd2089e419dbaaefe11aea3a3053ecbd524a2cb8..0f95d0c33b960deffb749bb73ae1abe1a5da0266 100644 --- a/Projects/BeLise/13Be.reaction +++ b/Projects/BeLise/13Be.reaction @@ -2,31 +2,31 @@ %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Beam - Particle= 12Be - Energy= 360 - SigmaEnergy= 20 - SigmaThetaX= 0.6138 - SigmaPhiY= 0.3812 - SigmaX= 6.216 - SigmaY= 6.109 - MeanThetaX= 0 - MeanPhiY= 0 - MeanX= 0 - MeanY= 0 - %EnergyProfilePath= - %XThetaXProfilePath= - %YPhiYProfilePath= + Particle= 12Be + Energy= 360 MeV + SigmaEnergy= 20 MeV + SigmaThetaX= 0.6138 deg + SigmaPhiY= 0.3812 deg + SigmaX= 6.216 mm + SigmaY= 6.109 mm + MeanThetaX= 0 deg + MeanPhiY= 0 deg + MeanX= 0 mm + MeanY= 0 mm + %EnergyProfilePath= + %XThetaXProfilePath= + %YPhiYProfilePath= %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% TwoBodyReaction - Beam= 12Be - Target= 2H - Light= 1H - Heavy= 13Be - ExcitationEnergyLight= 0.0 - ExcitationEnergyHeavy= 0 - CrossSectionPath= 11Li(d,3He)10He.txt CS10He - ShootLight= 1 - ShootHeavy= 1 + Beam= 12Be + Target= 2H + Light= 1H + Heavy= 13Be + ExcitationEnergyLight= 0.0 MeV + ExcitationEnergyHeavy= 0 MeV + CrossSectionPath= 11Li(d,3He)10He.txt CS10He + ShootLight= 1 + ShootHeavy= 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Projects/BeLise/9Be.reaction b/Projects/BeLise/9Be.reaction index 524cf6c4e65125525f808fe0d244836a641a772c..f079f75f180244d4f8e565b2d6a97bb99cfc1a09 100644 --- a/Projects/BeLise/9Be.reaction +++ b/Projects/BeLise/9Be.reaction @@ -2,31 +2,31 @@ %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Beam - Particle= 10Be - Energy= 280 - SigmaEnergy= 20 - SigmaThetaX= 0.6138 - SigmaPhiY= 0.3812 - SigmaX= 6.216 - SigmaY= 6.109 - MeanThetaX= 0 - MeanPhiY= 0 - MeanX= 0 - MeanY= 0 - %EnergyProfilePath= - %XThetaXProfilePath= - %YPhiYProfilePath= + Particle= 10Be + Energy= 280 MeV + SigmaEnergy= 20 MeV + SigmaThetaX= 0.6138 deg + SigmaPhiY= 0.3812 deg + SigmaX= 6.216 mm + SigmaY= 6.109 mm + MeanThetaX= 0 deg + MeanPhiY= 0 deg + MeanX= 0 mm + MeanY= 0 mm + %EnergyProfilePath= + %XThetaXProfilePath= + %YPhiYProfilePath= %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% TwoBodyReaction - Beam= 10Be - Target= 2H - Light= 3H - Heavy= 9Be - ExcitationEnergyLight= 0.0 - ExcitationEnergyHeavy= 0.0 - CrossSectionPath= 11Li(d,3He)10He.txt CS2 - ShootLight= 1 - ShootHeavy= 1 + Beam= 10Be + Target= 2H + Light= 3H + Heavy= 9Be + ExcitationEnergyLight= 0.0 MeV + ExcitationEnergyHeavy= 0.0 MeV + CrossSectionPath= 11Li(d,3He)10He.txt CS2 + ShootLight= 1 + ShootHeavy= 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Projects/BeLise/9Li.reaction b/Projects/BeLise/9Li.reaction index 65d3430805560dffedb2f71741618e3bc2d515d0..02db44e328bc5c5c8ab41d514f4d8ec1ae645b49 100644 --- a/Projects/BeLise/9Li.reaction +++ b/Projects/BeLise/9Li.reaction @@ -2,31 +2,31 @@ %%%%%%%%% Reaction file for 11Li(d,3He)10He reaction %%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Beam - Particle= 10Be - Energy= 280 - SigmaEnergy= 20 - SigmaThetaX= 0.6138 - SigmaPhiY= 0.3812 - SigmaX= 6.216 - SigmaY= 6.109 - MeanThetaX= 0 - MeanPhiY= 0 - MeanX= 0 - MeanY= 0 - %EnergyProfilePath= - %XThetaXProfilePath= - %YPhiYProfilePath= + Particle= 10Be + Energy= 280 MeV + SigmaEnergy= 20 MeV + SigmaThetaX= 0.6138 deg + SigmaPhiY= 0.3812 deg + SigmaX= 5.1 mm + SigmaY= 8.5 mm + MeanThetaX= 0 deg + MeanPhiY= 0 deg + MeanX= 2.5 mm + MeanY= -0.5 mm + %EnergyProfilePath= + %XThetaXProfilePath= + %YPhiYProfilePath= %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% TwoBodyReaction - Beam= 10Be - Target= 2H - Light= 3He - Heavy= 9Li - ExcitationEnergyLight= 0.0 - ExcitationEnergyHeavy= 0 - CrossSectionPath= 11Li(d,3He)10He.txt CS10He - ShootLight= 1 - ShootHeavy= 1 + Beam= 10Be + Target= 2H + Light= 3He + Heavy= 9Li + ExcitationEnergyLight= 0.0 MeV + ExcitationEnergyHeavy= 0 MeV + CrossSectionPath= 11Li(d,3He)10He.txt CS10He + ShootLight= 1 + ShootHeavy= 1 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/Projects/BeLise/Analysis.cxx b/Projects/BeLise/Analysis.cxx index e13da4e0794d730d16d1871e1fc678bd15bed900..c8a8a07a7219eeac42150b405990af3e39e26106 100644 --- a/Projects/BeLise/Analysis.cxx +++ b/Projects/BeLise/Analysis.cxx @@ -36,7 +36,7 @@ Analysis::~Analysis(){ //////////////////////////////////////////////////////////////////////////////// void Analysis::Init(){ - M2= (TMust2Physics*) m_DetectorManager->GetDetector("MUST2Array"); + M2= (TMust2Physics*) m_DetectorManager->GetDetector("M2Telescope"); Initial=new TInitialConditions(); InitOutputBranch(); InitInputBranch();