diff --git a/Inputs/DetectorConfiguration/Riken_65mm.detector b/Inputs/DetectorConfiguration/Riken_65mm.detector index 71a3c84bab878833a0c88de61bb768b86592448e..3754de046edaeb0802e0f2837bf2a5c88c56d340 100644 --- a/Inputs/DetectorConfiguration/Riken_65mm.detector +++ b/Inputs/DetectorConfiguration/Riken_65mm.detector @@ -7,7 +7,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% GeneralTarget %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%Target +Target THICKNESS= 1 RADIUS= 45 MATERIAL= CD2 diff --git a/Inputs/EventGenerator/11Li.beam b/Inputs/EventGenerator/11Li.beam index e7c437519193bcc9d5643445efd9530ad35bf2f4..9bc69caa7725561a700d467b617aced1d599c3eb 100644 --- a/Inputs/EventGenerator/11Li.beam +++ b/Inputs/EventGenerator/11Li.beam @@ -10,6 +10,6 @@ Beam BeamEnergySpread= 0 SigmaX= 6.232 SigmaY= 9.069 - SigmaThetaX= 0.01208 - SigmaPhiY= 0.01681 + SigmaThetaX= 0.6921330164 + SigmaPhiY= 0.963142053 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/NPAnalysis/10He_Riken/RunToTreat.txt b/NPAnalysis/10He_Riken/RunToTreat.txt deleted file mode 100644 index 20112b7d8b8825fad03d1ba1198c1c975c379dc5..0000000000000000000000000000000000000000 --- a/NPAnalysis/10He_Riken/RunToTreat.txt +++ /dev/null @@ -1,6 +0,0 @@ -TTreeName - SimulatedTree -RootFileName - ../../Outputs/Simulation/mySimul_0.root - ../../Outputs/Simulation/mySimul_1.root - ../../Outputs/Simulation/mySimul_0.root diff --git a/NPAnalysis/10He_Riken/src/Analysis.cc b/NPAnalysis/10He_Riken/src/Analysis.cc index d7562d0db53c984e14fb06de472a16e247b86cec..6df2fcbf98e8a79b1a4657c2d562f84483846fb4 100644 --- a/NPAnalysis/10He_Riken/src/Analysis.cc +++ b/NPAnalysis/10He_Riken/src/Analysis.cc @@ -42,7 +42,7 @@ int main(int argc,char** argv) RootOutput::getInstance()->GetTree()->Branch("ThetaCM",&ThetaCM,"ThetaCM/D") ; RootOutput::getInstance()->GetTree()->Branch("ResolThetaCM",&ResolThetaCM,"ResolThetaCM/D") ; // Get the formed Chained Tree and Treat it - TChain* Chain = RootInput:: getInstance() -> GetChain() ; + //TChain* Chain = RootInput:: getInstance() -> GetChain() ; // Open the ThinSi Branch Chain->SetBranchStatus("ThinSiEnergy",true) ; @@ -68,7 +68,7 @@ int main(int argc,char** argv) myDetector -> BuildPhysicalEvent() ; E = M2 -> GetEnergyDeposit(); - + XTarget = RandomEngine.Gaus(Init->GetICPositionX(0),1); YTarget = RandomEngine.Gaus(Init->GetICPositionY(0),1); @@ -119,29 +119,6 @@ int main(int argc,char** argv) X = HitDirection . X(); Y = HitDirection . Y(); } - -// else if(ThinSi>0) -// { -// -//// ThinSi= He3StripAl.EvaluateInitialEnergy( ThinSi , // Energy of the detected particle -//// 2*0.4*micrometer , // Target Thickness at 0 degree -//// 0 ); -//// -// ThinSi= He3TargetWind.EvaluateInitialEnergy( ThinSi , // Energy of the detected particle -// 15*micrometer , // Target Thickness at 0 degree -// ThetaN ); -//// -//// ThinSi= He3TargetGaz.EvaluateInitialEnergy( ThinSi , // Energy of the detected particle -//// 3*mm , // Target Thickness at 0 degree -//// ThetaN ); -// -// E= ThinSi; -// -// Ex = myReaction -> ReconstructRelativistic( E , Theta ) ; -// X = HitDirection . X(); -// Y = HitDirection . Y(); -// -// } else if(E>-1000 ) { diff --git a/NPSimulation/vis.mac b/NPSimulation/vis.mac index e8345fb35fdaef1effc82ccf8f853be6f7e0cc3b..7130261ec20bc96c8fddd2d03740a8b7316d5944 100644 --- a/NPSimulation/vis.mac +++ b/NPSimulation/vis.mac @@ -9,7 +9,7 @@ # choose a graphic system #/vis/open OGLIX #/vis/open OGLSX -/vis/open VRML2FILE +#/vis/open VRML2FILE /vis/scene/create /vis/drawVolume /vis/viewer/set/viewpointThetaPhi 0 0 deg