From afcf2b2d01b91afa3dd82c753acf5a5f6a593b32 Mon Sep 17 00:00:00 2001
From: matta <matta@npt>
Date: Mon, 26 Oct 2009 04:47:53 +0000
Subject: [PATCH] * Adding Cistal number support in NPA for MUST2 * Fixing
stuff in CalibrationManager - Now if the calibration parameter is not
found, the raw value is return without warning, wich is good for simulation
---
.../CalibrationManager/CalibrationManager.cxx | 6 +-
NPLib/MUST2/TMust2Physics.cxx | 128 +++++++++---------
2 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/NPLib/CalibrationManager/CalibrationManager.cxx b/NPLib/CalibrationManager/CalibrationManager.cxx
index 51049a5c5..ce5057890 100644
--- a/NPLib/CalibrationManager/CalibrationManager.cxx
+++ b/NPLib/CalibrationManager/CalibrationManager.cxx
@@ -152,11 +152,11 @@ double CalibrationManager::ApplyCalibration(string ParameterPath , double RawVal
if(it == fCalibrationCoeff.end() )
{
- cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " << endl ;
+ /* cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " << endl ;
cout << " ERROR: PARAMETER " << ParameterPath << " IS NOT FOUND IN THE CALIBRATION DATA BASE " << endl ;
- cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " << endl ;
+ cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " << endl ;*/
- return 0 ;
+ return RawValue ;
}
vector<double> Coeff = it->second ;
diff --git a/NPLib/MUST2/TMust2Physics.cxx b/NPLib/MUST2/TMust2Physics.cxx
index 60d879522..0ee5a0b64 100644
--- a/NPLib/MUST2/TMust2Physics.cxx
+++ b/NPLib/MUST2/TMust2Physics.cxx
@@ -169,100 +169,100 @@ vector < TVector2 > TMust2Physics :: Match_X_Y(TMust2Data* Data)
bool TMust2Physics :: Match_Si_SiLi(int X, int Y , int PadNbr)
{
if( PadNbr == 1
- && X<121 && X>93
- && Y<128 && Y>95 )
+ && X<=121 && X>=93
+ && Y<=128 && Y>=95 )
return true ;
else if( PadNbr == 2
- && X<121 && X>93
- && Y<100 && Y>65 )
+ && X<=121 && X>=93
+ && Y<=100 && Y>=65 )
return true ;
else if( PadNbr == 3
- && X<96 && X>61
- && Y<128 && Y>95 )
+ && X<=96 && X>=61
+ && Y<=128 && Y>=95 )
return true ;
else if( PadNbr == 4
- && X<96 && X>61
- && Y<100 && Y>65 )
+ && X<=96 && X>=61
+ && Y<=100 && Y>=65 )
return true ;
else if( PadNbr == 5
- && X<67 && X>30
- && Y<100 && Y>65)
+ && X<=67 && X>=30
+ && Y<=100 && Y>=65)
return true ;
else if( PadNbr == 6
- && X<67 && X>30
- && Y<128 && Y>95 )
+ && X<=67 && X>=30
+ && Y<=128 && Y>=95 )
return true ;
else if( PadNbr == 7
- && X<35 && X>6
- && Y<100 && Y>65 )
+ && X<=35 && X>=6
+ && Y<=100 && Y>=65 )
return true ;
else if( PadNbr == 8
- && X<35 && X>6
- && Y<128 && Y>95 )
+ && X<=35 && X>=6
+ && Y<=128 && Y>=95 )
return true ;
else if( PadNbr == 9
- && X<121 && X>93
- && Y<31 && Y>1 )
+ && X<=121 && X>=93
+ && Y<=31 && Y>=1 )
return true ;
else if( PadNbr == 10
- && X<121 && X>93
- && Y<60 && Y>26 )
+ && X<=121 && X>=93
+ && Y<=60 && Y>=26 )
return true ;
else if( PadNbr == 11
- && X<96 && X>61
- && Y<31 && Y>1 )
+ && X<=96 && X>=61
+ && Y<=31 && Y>=1 )
return true ;
else if( PadNbr == 12
- && X<96 && X>61
- && Y<60 && Y>26)
+ && X<=96 && X>=61
+ && Y<=60 && Y>=26)
return true ;
else if( PadNbr == 13
- && X<67 && X>30
- && Y<60 && Y>26 )
+ && X<=67 && X>=30
+ && Y<=60 && Y>=26 )
return true ;
else if( PadNbr == 14
- && X<67 && X>30
- && Y<31 && Y>1 )
+ && X<=67 && X>=30
+ && Y<=31 && Y>=1 )
return true ;
else if( PadNbr == 15
- && X<35 && X>6
- && Y<60 && Y>26 )
+ && X<=35 && X>=6
+ && Y<=60 && Y>=26 )
return true ;
else if( PadNbr == 16
- && X<35 && X>6
- && Y<31 && Y>1 )
+ && X<=35 && X>=6
+ && Y<=31 && Y>=1 )
return true ;
@@ -275,100 +275,100 @@ bool TMust2Physics :: Match_Si_SiLi(int X, int Y , int PadNbr)
bool TMust2Physics :: Match_Si_CsI(int X, int Y , int CristalNbr)
{
if( CristalNbr == 1
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=71 && X>=27
+ && Y<=101 && Y>=59 )
return true ;
else if( CristalNbr == 2
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=71 && X>=27
+ && Y<=128 && Y>=90 )
return true ;
else if( CristalNbr == 3
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=35 && X>=1
+ && Y<=101 && Y>=59 )
return true ;
else if( CristalNbr == 4
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=35 && X>=1
+ && Y<=128 && Y>=90 )
return true ;
else if( CristalNbr == 5
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=104 && X>=60
+ && Y<=71 && Y>=30 )
return true ;
else if( CristalNbr == 6
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=104 && X>=60
+ && Y<=41 && Y>=1 )
return true ;
else if( CristalNbr == 7
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=128 && X>=90
+ && Y<=71 && Y>=30 )
return true ;
else if( CristalNbr == 8
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=128 && X>=90
+ && Y<=41 && Y>=1 )
return true ;
else if( CristalNbr == 9
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=71 && X>=27
+ && Y<=71 && Y>=40 )
return true ;
else if( CristalNbr == 10
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=71 && X>=27
+ && Y<=41 && Y>=1 )
return true ;
else if( CristalNbr == 11
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=35 && X>=1
+ && Y<=71 && Y>=30 )
return true ;
else if( CristalNbr == 12
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=35 && X>=1
+ && Y<=41 && Y>=1 )
return true ;
else if( CristalNbr == 13
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=104 && X>=60
+ && Y<=101 && Y>=59 )
return true ;
else if( CristalNbr == 14
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=104 && X>=60
+ && Y<=128 && Y>=90 )
return true ;
else if( CristalNbr == 15
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=128 && X>=90
+ && Y<=101 && Y>=59 )
return true ;
else if( CristalNbr == 16
- && X<1 && X>1
- && Y<1 && Y>1 )
+ && X<=128 && X>=90
+ && Y<=128 && Y>=90 )
return true ;
--
GitLab