Merge branch 'NPTool.2.dev' of https://gitlab.in2p3.fr/np/nptool into NPTool.2.dev

NPLib/Detectors/PISTA/TPISTAPhysics.cxx

@@ -257,14 +257,20 @@ void TPISTAPhysics::BuildPhysicalEvent() {
     int DEMult = m_PreTreatedData->GetPISTADEMult();
     int EMult = m_PreTreatedData->GetPISTAEMult();
 
+    int DE_DetNbr = -1;
+    int DE_StripNbr = -1;
+    int E_DetNbr = -1;
+    int E_StripNbr = -1;
+
     for(unsigned int i=0; i<DEMult; i++){
+      DE_DetNbr = m_PreTreatedData->GetPISTA_DE_DetectorNbr(i);
+      DE_StripNbr = m_PreTreatedData->GetPISTA_DE_StripNbr(i);
+      
       for(unsigned int j=0; j<EMult; j++){
-        int DE_DetNbr = m_PreTreatedData->GetPISTA_DE_DetectorNbr(i);
-        int E_DetNbr = m_PreTreatedData->GetPISTA_E_DetectorNbr(j);
+
+        E_DetNbr = m_PreTreatedData->GetPISTA_E_DetectorNbr(j);
+        E_StripNbr = m_PreTreatedData->GetPISTA_E_StripNbr(j);
         if(DE_DetNbr==E_DetNbr){
-          int DE_StripNbr = m_PreTreatedData->GetPISTA_DE_StripNbr(i);
-          int E_StripNbr = m_PreTreatedData->GetPISTA_E_StripNbr(j);
-          
           // Taking Strip energy for DE
           double DE_Energy = m_PreTreatedData->GetPISTA_DE_StripEnergy(i);
           // Taking BAck Energy for E

NPSimulation/Detectors/PISTA/PISTA.cc

@@ -64,12 +64,9 @@ namespace PISTA_NS{
   const double E_ResoEnergy  = 0.018*MeV ;
 
   // Trapezoid dimension
-  const double TrapezoidBaseLarge = 74.1*mm;
-  //const double TrapezoidBaseLarge = 78.1*mm;
-  const double TrapezoidBaseSmall = 39.3*mm;
-  //const double TrapezoidBaseSmall = 43.3*mm;
-  const double TrapezoidHeight = 57.8*mm;
-  //const double TrapezoidHeight = 61.8*mm;
+  const double TrapezoidBaseLarge = 78.1*mm;
+  const double TrapezoidBaseSmall = 43.3*mm;
+  const double TrapezoidHeight = 61.7*mm;
   const double TrapezoidLength = 1*cm;
   const double FirstStageThickness = 100*um;
   const double SecondStageThickness = 1*mm;
@@ -375,13 +372,13 @@ void PISTA::InitializeScorers() {
       SecondStageNbrOfStrips,1);
 
   G4VPrimitiveScorer* InteractionFirstStage = new InteractionScorers::PS_Interactions("InteractionFirstStage",ms_InterCoord,0);
-  G4VPrimitiveScorer* InteractionSecondStage = new InteractionScorers::PS_Interactions("InteractionSecondStage",ms_InterCoord,0);
+  //G4VPrimitiveScorer* InteractionSecondStage = new InteractionScorers::PS_Interactions("InteractionSecondStage",ms_InterCoord,0);
 
   // Register it to the multifunctionnal detector
   m_FirstStageScorer->RegisterPrimitive(FirstStageScorer);
   m_FirstStageScorer->RegisterPrimitive(InteractionFirstStage);
   m_SecondStageScorer->RegisterPrimitive(SecondStageScorer);
-  m_SecondStageScorer->RegisterPrimitive(InteractionSecondStage);
+  //m_SecondStageScorer->RegisterPrimitive(InteractionSecondStage);
 
   G4SDManager::GetSDMpointer()->AddNewDetector(m_FirstStageScorer);
   G4SDManager::GetSDMpointer()->AddNewDetector(m_SecondStageScorer);

Projects/PISTA/Analysis.cxx

@@ -64,7 +64,7 @@ void Analysis::TreatEvent(){
   OriginalEx = ReactionConditions->GetExcitation4();
 */
   int mult = InteractionCoordinates->GetDetectedMultiplicity();
-  if(mult==2){
+  if(mult==1){
     for(int i=0; i<mult; i++){
       Xpista = InteractionCoordinates->GetDetectedPositionX(i);
       Ypista = InteractionCoordinates->GetDetectedPositionY(i);