Updated CATS mask calib

NPLib/Detectors/CATS/TCATSPhysics.cxx

@@ -222,31 +222,20 @@ void TCATSPhysics::BuildPhysicalEvent(){
     }
   }
 
-  // Sorting Positions depending on Z
- // std::sort(Positions.begin(), Positions.end(), 
- // [&](const auto& Pos1, const auto& Pos2){
- //   return Pos1.first < Pos2.first;
- // });
   // At least two CATS need to gave back position in order to reconstruct on Target 
-  if(Positions.size()>1){
-      double t = (m_Zproj-Positions[2].first)/(m_Zproj-Positions[1].first);
-      PositionOnTargetX= (Positions[2].second.first - Positions[1].second.first*t)/(1 - t);
-      PositionOnTargetY= (Positions[2].second.second - Positions[1].second.second*t)/(1 - t);
-      // PositionOnTargetY= Positions[2].second.second + (Positions[2].second.second-3-Positions[1].second.second)*t;
+  if(Positions.size()==2){ 
+      double t = (m_Zproj-Positions[1].first)/(m_Zproj-Positions[2].first);
+      PositionOnTargetX= Positions[1].second.first + (Positions[2].second.first - Positions[1].second.first)*t;
+      PositionOnTargetY= Positions[1].second.second + (Positions[2].second.second - Positions[1].second.second)*t;
     if(Mask1_Z != 0 && Mask2_Z != 0)
      { 
-      //double tmask1 = (Mask1_Z-Positions[2].first)/(Positions[2].first-Positions[1].first);
-      //double tmask2 = (Mask2_Z-Positions[2].first)/(Positions[2].first-Positions[1].first);
-      //PositionOnMask1X= Positions[2].second.first + (Positions[2].second.first-Positions[1].second.first)*tmask1;
-      //PositionOnMask1Y= Positions[2].second.second + (Positions[2].second.second-Positions[1].second.second)*tmask1;
-      //PositionOnMask2X= Positions[2].second.first + (Positions[2].second.first-Positions[1].second.first)*tmask2;
-      //PositionOnMask2Y= Positions[2].second.second + (Positions[2].second.second-Positions[1].second.second)*tmask2;
-      double tmask1 = (Mask1_Z-Positions[2].first)/(Mask1_Z-Positions[1].first);
-      double tmask2 = (Mask2_Z-Positions[2].first)/(Mask2_Z-Positions[1].first);
-      PositionOnMask1X=  (Positions[2].second.first  -Positions[1].second.first*tmask1)/(1.-tmask1);
-      PositionOnMask1Y=  (Positions[2].second.second -Positions[1].second.second*tmask1)/(1.-tmask1);
-      PositionOnMask2X=  (Positions[2].second.first  -Positions[1].second.first*tmask2)/(1.-tmask2);
-      PositionOnMask2Y=  (Positions[2].second.second -Positions[1].second.second*tmask2)/(1.-tmask2);
+      double tmask1 = (Positions[1].first-Mask1_Z)/(Positions[2].first - Positions[1].first);
+      double tmask2 = (Positions[2].first-Mask2_Z)/(Positions[2].first - Positions[1].first);
+      
+      PositionOnMask1X=  Positions[1].second.first - (Positions[2].second.first  -Positions[1].second.first)*tmask1;
+      PositionOnMask1Y=  Positions[1].second.second - (Positions[2].second.second -Positions[1].second.second)*tmask1;
+      PositionOnMask2X=  Positions[2].second.first - (Positions[2].second.first  -Positions[1].second.first)*tmask2;
+      PositionOnMask2Y=  Positions[2].second.second - (Positions[2].second.second -Positions[1].second.second)*tmask2;
      }
      else{
       PositionOnMask1X= -1000;

Projects/E805/DetectorConfiguration/MUST2_E805_b4_r0365.detector

@@ -54,17 +54,17 @@ M2Telescope
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CATSDetector
  CATSNumber = 1
- X1_Y1= 42.7  -41.96  -1587.1 mm
- X28_Y1= -28.42  -41.96  -1587.1 mm
- X1_Y28= 42.7  29.16  -1587.1 mm
- X28_Y28= -28.42 29.16  -1587.1 mm
+ X1_Y1= 42.83  -41.80  -1587.1 mm
+ X28_Y1= -28.29  -41.80  -1587.1 mm
+ X1_Y28= 42.83  29.32  -1587.1 mm
+ X28_Y28= -28.29 29.32  -1587.1 mm
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CATSDetector
  CATSNumber = 2
- X1_Y1= 33.50    -37.50   -1090.1 mm
- X28_Y1= -37.62  -37.50   -1090.1 mm
- X1_Y28= 33.50   33.62  -1090.1 mm 
- X28_Y28= -37.62  33.62   -1090.1 mm
+ X1_Y1= 33.40    -37.00   -1090.1 mm
+ X28_Y1= -37.72  -37.00   -1090.1 mm
+ X1_Y28= 33.40   34.12  -1090.1 mm 
+ X28_Y28= -37.72  34.12   -1090.1 mm
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 MASK
  MaskNumber = 1