diff --git a/Inputs/DetectorConfiguration/Paris1.detector b/Inputs/DetectorConfiguration/Paris1.detector index b6e1f1b7e187f9ea770395d3188a249044814a5f..ce08b1f20fb3491be18f3a2880ae15bfa3c3c35c 100644 --- a/Inputs/DetectorConfiguration/Paris1.detector +++ b/Inputs/DetectorConfiguration/Paris1.detector @@ -73,7 +73,7 @@ ParisCluster B= 225.920617 -106.419571 84.5 C= 106.419571 -225.920617 -84.5 D= 225.920617 -106.419571 -84.5 -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%1 ParisCluster A= 84.5 84.5 -235 B= -84.5 84.5 -235 diff --git a/NPLib/Utility/npanalysis.cxx b/NPLib/Utility/npanalysis.cxx index b572f8c9c2e7474b8fea5dfbcc9ac0aed12de108..14f65d58127573a4bb23cb426ed6ffdefd9383b2 100644 --- a/NPLib/Utility/npanalysis.cxx +++ b/NPLib/Utility/npanalysis.cxx @@ -73,7 +73,7 @@ int main(int argc , char** argv){ NPL::DetectorManager* myDetector = new NPL::DetectorManager(); myDetector->ReadConfigurationFile(detectorfileName); - // Attempt to load an analysis + // Attempt to load an analysis NPL::VAnalysis* UserAnalysis = NULL; string libName = "./libNPAnalysis" + myOptionManager->GetSharedLibExtension(); dlopen(libName.c_str(),RTLD_NOW | RTLD_GLOBAL); @@ -157,7 +157,8 @@ int main(int argc , char** argv){ else{ cout << "\033[1;31m ERROR: You are requesting to rebuild a Physics Tree without any User Analysis, nothing to be done\033[0m" <<endl; - exit(1); + // Quit without error + exit(0); } } diff --git a/NPSimulation/Detectors/Paris/Paris.cc b/NPSimulation/Detectors/Paris/Paris.cc index fe05c35c751f102657c154798dd10f218ba382a2..3489a54a0e21dc21e6376373d32b61af28419150 100644 --- a/NPSimulation/Detectors/Paris/Paris.cc +++ b/NPSimulation/Detectors/Paris/Paris.cc @@ -86,7 +86,7 @@ void Paris::AddCluster(G4ThreeVector Pos1, G4ThreeVector Pos2, G4ThreeVector Pos G4ThreeVector u = Pos1-Pos2; G4ThreeVector v = Pos1-Pos4; u = u.unit(); v = v.unit(); - G4ThreeVector w = Pos.unit(); + G4ThreeVector w = u.cross(v); Pos = Pos + w*Length*0.5; m_Type.push_back(1); diff --git a/Projects/T40/Analysis.cxx b/Projects/T40/Analysis.cxx index 8170fab31d6698f39b41859836e12df82674ae3e..b64ced4962b59b6cf4bdbf85aa1fd723f793284f 100644 --- a/Projects/T40/Analysis.cxx +++ b/Projects/T40/Analysis.cxx @@ -107,7 +107,6 @@ void Analysis::TreatEvent(){ if(XTarget>-1000 && YTarget>-1000){ TVector3 BeamImpact(XTarget,YTarget,0); TVector3 HitDirection = TH -> GetRandomisedPositionOfInteraction(countTiaraHyball) - BeamImpact ; - // TVector3 HitDirection = TH -> GetPositionOfInteraction(countTiaraHyball) - BeamImpact ; ThetaLab = HitDirection.Angle( BeamDirection ); ThetaTHSurface = HitDirection.Angle(TVector3(0,0,-1) ); diff --git a/Projects/T40/Results.cxx b/Projects/T40/Results.cxx index 09e155f9aa026384f9094b2ff1363c32ebff2257..e4612077e2af0814b2a936090909fabc4da6860c 100644 --- a/Projects/T40/Results.cxx +++ b/Projects/T40/Results.cxx @@ -4,7 +4,7 @@ void Results(){ Tree->Draw("ELab:ThetaLab>>h2(1000,0,180,1000,0,20)","ELab>0","colz"); new TCanvas(); - Tree->Draw("Ex>>h4(1000)","ELab>0 && Ex>-1000"); + Tree->Draw("Ex>>h4(1000,-2,5)","ELab>0 && Ex>-1000 && ThetaLab>164"); TCanvas* c = new TCanvas("CAS","Control Analyse-Simu"); c->Divide(2,2); c->cd(1);