Commit f4f70e49 authored by Morfouace's avatar Morfouace
Browse files

* Updating PISTA detector

parent b227e564
Pipeline #99194 passed with stages
in 15 minutes and 4 seconds
......@@ -139,9 +139,9 @@ void TPISTAPhysics::AddDetector(double R, double Theta, double Phi){
///////////////////////////////////////////////////////////////////////////
TVector3 TPISTAPhysics::GetPositionOfInteraction(const int i){
TVector3 Position = TVector3(GetStripPositionX(DetectorNumber[i], E_StripX[i], E_StripY[i]),
GetStripPositionY(DetectorNumber[i], E_StripX[i], E_StripY[i]),
GetStripPositionZ(DetectorNumber[i], E_StripX[i], E_StripY[i]));
TVector3 Position = TVector3(GetStripPositionX(DetectorNumber[i], E_StripX[i], DE_StripY[i]),
GetStripPositionY(DetectorNumber[i], E_StripX[i], DE_StripY[i]),
GetStripPositionZ(DetectorNumber[i], E_StripX[i], DE_StripY[i]));
/*TVector3 Position = TVector3(GetStripPositionX(DetectorNumber[i], DE_StripX[i], E_StripY[i]),
GetStripPositionY(DetectorNumber[i], DE_StripX[i], E_StripY[i]),
......@@ -211,7 +211,8 @@ void TPISTAPhysics::BuildPhysicalEvent() {
DetectorNumber.push_back(DE_N);
DE_StripX.push_back(DE_X);
DE_StripY.push_back(DE_Y);
DE.push_back(DE_YE);
//DE.push_back(DE_YE);
DE.push_back(DE_XE);
E_StripX.push_back(E_X);
E_StripY.push_back(E_Y);
E.push_back(E_XE);
......
......@@ -346,11 +346,11 @@ void PISTA::InitializeScorers() {
G4VPrimitiveScorer* FirstStageScorer = new DSSDScorers::PS_Rectangle("FirstStageScorer",1,
TrapezoidBaseLarge,
TrapezoidHeight,
122,97);
1,97);
G4VPrimitiveScorer* SecondStageScorer = new DSSDScorers::PS_Rectangle("SecondStageScorer",1,
TrapezoidBaseLarge,
TrapezoidHeight,
122,97);
122,1);
G4VPrimitiveScorer* InteractionFirstStage = new InteractionScorers::PS_Interactions("InteractionFirstStage",ms_InterCoord,0);
G4VPrimitiveScorer* InteractionSecondStage = new InteractionScorers::PS_Interactions("InteractionSecondStage",ms_InterCoord,0);
......
......@@ -61,7 +61,7 @@ void Analysis::TreatEvent(){
OriginalThetaLab = ReactionConditions->GetTheta(0);
OriginalElab = ReactionConditions->GetKineticEnergy(0);
OriginalBeamEnergy = ReactionConditions->GetBeamEnergy();
OriginalEx = ReactionConditions->GetExcitation4();
int mult = InteractionCoordinates->GetDetectedMultiplicity();
if(mult>0){
......@@ -88,6 +88,8 @@ void Analysis::TreatEvent(){
if(PISTA->EventMultiplicity==1){
for(unsigned int i = 0; i<PISTA->EventMultiplicity; i++){
double Energy = PISTA->DE[i] + PISTA->E[i];
DeltaE = PISTA->DE[i];
Eres = PISTA->E[i];
PID = pow(Energy,1.78)-pow(PISTA->E[i],1.78);
TVector3 HitDirection = PISTA->GetPositionOfInteraction(i)-PositionOnTarget;
......@@ -107,12 +109,15 @@ void Analysis::TreatEvent(){
////////////////////////////////////////////////////////////////////////////////
void Analysis::InitOutputBranch(){
RootOutput::getInstance()->GetTree()->Branch("OriginalBeamEnergy",&OriginalBeamEnergy,"OriginalBeamEnergy/D");
RootOutput::getInstance()->GetTree()->Branch("OriginalEx",&OriginalEx,"OriginalEx/D");
RootOutput::getInstance()->GetTree()->Branch("BeamEnergy",&BeamEnergy,"BeamEnergy/D");
RootOutput::getInstance()->GetTree()->Branch("XTarget",&XTarget,"XTarget/D");
RootOutput::getInstance()->GetTree()->Branch("YTarget",&YTarget,"YTarget/D");
RootOutput::getInstance()->GetTree()->Branch("ZTarget",&ZTarget,"ZTarget/D");
RootOutput::getInstance()->GetTree()->Branch("OptimumEx",&OptimumEx,"OptimumEx/D");
RootOutput::getInstance()->GetTree()->Branch("Ex",&Ex,"Ex/D");
RootOutput::getInstance()->GetTree()->Branch("DeltaE",&DeltaE,"DeltaE/D");
RootOutput::getInstance()->GetTree()->Branch("Eres",&Eres,"Eres/D");
RootOutput::getInstance()->GetTree()->Branch("PID",&PID,"PID/D");
RootOutput::getInstance()->GetTree()->Branch("Elab",&Elab,"Elab/D");
RootOutput::getInstance()->GetTree()->Branch("OriginalElab",&OriginalElab,"OriginalElab/D");
......@@ -138,9 +143,12 @@ void Analysis::InitInputBranch(){
////////////////////////////////////////////////////////////////////////////////
void Analysis::ReInitValue(){
OriginalBeamEnergy = -1000;
OriginalEx = -1000;
BeamEnergy = -1000;
OptimumEx = -1000;
Ex = -1000;
DeltaE = -1000;
Eres = -1000;
Elab = -1000;
OriginalElab = -1000;
OriginalThetaLab = -1000;
......
......@@ -46,6 +46,7 @@ class Analysis: public NPL::VAnalysis{
private:
double OriginalBeamEnergy;
double OriginalEx;
double BeamEnergy;
double R;
double XTarget;
......@@ -53,6 +54,8 @@ class Analysis: public NPL::VAnalysis{
double ZTarget;
double OriginalElab;
double Elab;
double DeltaE;
double Eres;
double ThetaLab;
double ThetaCM;
double OptimumEx;
......
Markdown is supported
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