Skip to content
Snippets Groups Projects
Commit 37fd782c authored by matta's avatar matta
Browse files

* Fixing Bud in NPS:Must2Scorers.cc 

 - X and Y was inverted in the PSStripNumberX and PSStripNumberY function causing a wrong analysed spectra of excitation energy
parent 2697dbff
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Inputs/DetectorConfiguration/Riken_65mm.detector
+ 74
− 74
View file @ 37fd782c
......@@ -7,8 +7,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
GeneralTarget
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%Target
THICKNESS= 1
Target
THICKNESS= 0.001
RADIUS= 45
MATERIAL= CD2
ANGLE= 45
......@@ -16,7 +16,7 @@ GeneralTarget
Y= 0
Z= 0
CryoTarget
%CryoTarget
THICKNESS= 3
RADIUS= 45
TEMPERATURE= 26
......@@ -115,77 +115,77 @@ SILI= 1
CSI= 0
VIS= all
%%%%%%%%%%%%%%%%%%%%
AddThinSi
%%%%%%%%% Det 1 %%%%%%%%
ThinSi
A= 17.61 9.85 104.11
B= 64.48 9.85 85.31
C= 58.66 56.29 70.79
D= 11.79 56.29 89.69
%%%%%%%%% Det 2 %%%%%%%%
ThinSi
A= -11.79 56.29 89.59
B= -58.66 56.29 70.79
C= -64.48 9.85 85.31
D= -17.61 9.85 104.11
%%%%%%%%% Det 3 %%%%%%%%
ThinSi
A= -17.61 -9.85 104.11
B= -64.48 -9.85 85.31
C= -58.66 -56.29 70.79
D= -11.79 -56.29 89.59
%%%%%%%%% Det 4 %%%%%%%%
ThinSi
A= 11.79 -56.29 89.59
B= 58.66 -56.29 70.79
C= 64.48 -9.85 85.31
D= 17.61 -9.85 104.11
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
ScintillatorPlastic
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Plastic
X= 0
Y= -15
Z= 318
Shape= Square
Height= 70
Width= 40
Thickness= 20
Scintillator= BC400
LeadThickness= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Plastic
X= 0
Y= -15
Z= 343
Thickness= 30
Shape= Square
Height= 70
Width= 40
Scintillator= BC400
LeadThickness= 2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%
%%AddThinSi
%%%%%%%%%% Det 1 %%%%%%%%
%ThinSi
%A= 17.61 9.85 104.11
%B= 64.48 9.85 85.31
%C= 58.66 56.29 70.79
%D= 11.79 56.29 89.69
%
%%%%%%%%%% Det 2 %%%%%%%%
%ThinSi
%A= -11.79 56.29 89.59
%B= -58.66 56.29 70.79
%C= -64.48 9.85 85.31
%D= -17.61 9.85 104.11
%
%%%%%%%%%% Det 3 %%%%%%%%
%ThinSi
%A= -17.61 -9.85 104.11
%B= -64.48 -9.85 85.31
%C= -58.66 -56.29 70.79
%D= -11.79 -56.29 89.59
%
%%%%%%%%%% Det 4 %%%%%%%%
%ThinSi
%A= 11.79 -56.29 89.59
%B= 58.66 -56.29 70.79
%C= 64.48 -9.85 85.31
%D= 17.61 -9.85 104.11
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%ScintillatorPlastic
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%Plastic
THETA= 0
PHI= 0
R= 318
Thickness= 20
Radius= 20
Scintillator= BC400
LeadThickness= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% X= 0
% Y= -15
% Z= 318
% Shape= Square
% Height= 70
% Width= 40
% Thickness= 20
% Scintillator= BC400
% LeadThickness= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%Plastic
THETA= 0
PHI= 0
R= 343
Thickness= 30
Radius= 20
Scintillator= BC400
LeadThickness= 2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% X= 0
% Y= -15
% Z= 343
% Thickness= 30
% Shape= Square
% Height= 70
% Width= 40
% Scintillator= BC400
% LeadThickness= 2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Plastic
% THETA= 0
% PHI= 0
% R= 318
% Thickness= 20
% Radius= 20
% Scintillator= BC400
% LeadThickness= 0
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%Plastic
% THETA= 0
% PHI= 0
% R= 343
% Thickness= 30
% Radius= 20
% Scintillator= BC400
% LeadThickness= 2
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Inputs/EventGenerator/10He.reaction
+ 4
− 4
View file @ 37fd782c
......@@ -10,10 +10,10 @@ TransfertToResonance
ExcitationEnergy= 1.0
BeamEnergy= 550
BeamEnergySpread= 0
SigmaThetaX= 0.6921330164
SigmaPhiY= 0.963142053
SigmaX= 6.232
SigmaY= 9.069
SigmaThetaX= 0.01
SigmaPhiY= 0.01
SigmaX= 0.01
SigmaY= 0.01
ResonanceWidth= 0
ResonanceDecayZ= 2
ResonanceDecayA= 8
......
NPAnalysis/10He_Riken/src/Analysis.cc
+ 58
− 58
View file @ 37fd782c
......@@ -78,8 +78,8 @@ int main(int argc,char** argv)
// Get Detector Pointer:
TMust2Physics* M2 = (TMust2Physics*) myDetector -> m_Detector["MUST2"] ;
TPlasticPhysics* Pl = (TPlasticPhysics*) myDetector -> m_Detector["Plastic"] ;
TSSSDPhysics* ThinSi = (TSSSDPhysics*) myDetector -> m_Detector["SSSD"] ;
// TPlasticPhysics* Pl = (TPlasticPhysics*) myDetector -> m_Detector["Plastic"] ;
// TSSSDPhysics* ThinSi = (TSSSDPhysics*) myDetector -> m_Detector["SSSD"] ;
RootOutput::getInstance()->GetList()->Add(myHist1D);
......@@ -183,35 +183,35 @@ RootOutput::getInstance()->GetList()->Add(myHist1D);
{
ELab[hit] = M2 -> Si_E[hit] ;
ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
// ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
// 0.4*micrometer , // Target Thickness at 0 degree
// ThetaMM2Surface );
if(ThinSi -> Energy.size() > 0)
{
ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
ELab[hit] += ThinSi-> Energy[hit];
ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
}
// if(ThinSi -> Energy.size() > 0)
// {
//// ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 0.4*micrometer , // Target Thickness at 0 degree
//// ThetaMM2Surface );
//// ELab[hit] += ThinSi-> Energy[hit];
//// ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 0.4*micrometer , // Target Thickness at 0 degree
//// ThetaMM2Surface );
// }
ELab[hit]= He3TargetWind.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0*micrometer , // Target Thickness at 0 degree
ThetaN );
ELab[hit]= He3TargetGaz.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
3*micrometer , // Target Thickness at 0 degree
ThetaN );
//// ELab[hit]= He3TargetWind.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 0*micrometer , // Target Thickness at 0 degree
//// ThetaN );
////
//// ELab[hit]= He3TargetGaz.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 3*micrometer , // Target Thickness at 0 degree
//// ThetaN );
//
ThetaCM[hit] = He10Reaction -> EnergyLabToThetaCM( ELab[hit] ) /deg ;
ExcitationEnergy[hit] = He10Reaction -> ReconstructRelativistic( ELab[hit] , ThetaLab[hit] ) ;
if(ThinSi -> Energy.size() > 0 )
if(cut3He_M2_SSSD->IsInside(ThinSi -> Energy[hit], M2 -> Si_E[hit]) )
myHist1D->Fill(ExcitationEnergy[hit],EventWeight);
// if(ThinSi -> Energy.size() > 0 )
// if(cut3He_M2_SSSD->IsInside(ThinSi -> Energy[hit], M2 -> Si_E[hit]) )
// myHist1D->Fill(ExcitationEnergy[hit],EventWeight);
X[hit] = HitDirection . X();
Y[hit] = HitDirection . Y();
......@@ -223,43 +223,43 @@ RootOutput::getInstance()->GetList()->Add(myHist1D);
ELab[hit]= M2 ->CsI_E[hit] ;
ELab[hit]= He3TargetWind.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
3*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
// ELab[hit]= He3TargetWind.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
// 3*micrometer , // Target Thickness at 0 degree
// ThetaMM2Surface );
//
// ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
// 0.4*micrometer , // Target Thickness at 0 degree
// ThetaMM2Surface );
ELab[hit]+= M2 ->Si_E[hit];
ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
// ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
// 0.4*micrometer , // Target Thickness at 0 degree
// ThetaMM2Surface );
if(ThinSi -> Energy.size() > 0)
{
ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
ELab[hit] += ThinSi-> Energy[hit];
ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0.4*micrometer , // Target Thickness at 0 degree
ThetaMM2Surface );
}
ELab[hit]= He3TargetWind.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
0*micrometer , // Target Thickness at 0 degree
ThetaN );
ELab[hit]= He3TargetGaz.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
3*micrometer , // Target Thickness at 0 degree
ThetaN );
// if(ThinSi -> Energy.size() > 0)
// {
//// ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 0.4*micrometer , // Target Thickness at 0 degree
//// ThetaMM2Surface );
//// ELab[hit] += ThinSi-> Energy[hit];
//// ELab[hit]= He3StripAl.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 0.4*micrometer , // Target Thickness at 0 degree
//// ThetaMM2Surface );
// }
//
//// ELab[hit]= He3TargetWind.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 0*micrometer , // Target Thickness at 0 degree
//// ThetaN );
////
//// ELab[hit]= He3TargetGaz.EvaluateInitialEnergy( ELab[hit] , // Energy of the detected particle
//// 3*micrometer , // Target Thickness at 0 degree
//// ThetaN );
////
ThetaCM[hit]= He10Reaction -> EnergyLabToThetaCM( ELab[hit] ) /deg ;
ExcitationEnergy[hit] = He10Reaction -> ReconstructRelativistic( ELab[hit], ThetaLab[hit]) ;
if( cut3He_MUST2->IsInside(M2 -> Si_E[hit], M2 -> CsI_E[hit]) )
myHist1D->Fill(ExcitationEnergy[hit],EventWeight);
//
// if( cut3He_MUST2->IsInside(M2 -> Si_E[hit], M2 -> CsI_E[hit]) )
// myHist1D->Fill(ExcitationEnergy[hit],EventWeight);
X[hit] = HitDirection . X();
Y[hit] = HitDirection . Y();
......
NPSimulation/src/Must2Scorers.cc
+ 2
− 2
View file @ 37fd782c
......@@ -52,7 +52,7 @@ G4bool PSStripNumberX::ProcessHits(G4Step* aStep, G4TouchableHistory*)
G4ThreeVector POS = aStep->GetPreStepPoint()->GetPosition();
POS = aStep->GetPreStepPoint()->GetTouchableHandle()->GetHistory()->GetTopTransform().TransformPoint(POS);
G4double temp = (POS(0) + m_StripPlaneSize / 2.) / m_StripPitch ;
G4double temp = (POS(1) + m_StripPlaneSize / 2.) / m_StripPitch ;
G4int X = int(temp) + 1 ;
//Rare case where particle is close to edge of silicon plan
if (X == m_NumberOfStrip+1) X = m_NumberOfStrip;
......@@ -118,7 +118,7 @@ G4bool PSStripNumberY::ProcessHits(G4Step* aStep, G4TouchableHistory*)
G4ThreeVector POS = aStep->GetPreStepPoint()->GetPosition();
POS = aStep->GetPreStepPoint()->GetTouchableHandle()->GetHistory()->GetTopTransform().TransformPoint(POS);
G4double temp = (POS(1) + m_StripPlaneSize / 2.) / m_StripPitch ;
G4double temp = (POS(0) + m_StripPlaneSize / 2.) / m_StripPitch ;
G4int temp2 = temp ;
G4int Y = temp2 + 1 ;
//Rare case where particle is close to edge of silicon plan
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment