Skip to content
Snippets Groups Projects
Commit afcf2b2d authored by matta's avatar matta
Browse files

* 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
parent f1cef8a2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
NPLib/CalibrationManager/CalibrationManager.cxx
+ 3
− 3
View file @ afcf2b2d
...@@ -152,11 +152,11 @@ double CalibrationManager::ApplyCalibration(string ParameterPath , double RawVal ...@@ -152,11 +152,11 @@ double CalibrationManager::ApplyCalibration(string ParameterPath , double RawVal
if(it == fCalibrationCoeff.end() ) if(it == fCalibrationCoeff.end() )
{ {
cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " << endl ; /* cout << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX " << endl ;
cout << " ERROR: PARAMETER " << ParameterPath << " IS NOT FOUND IN THE CALIBRATION DATA BASE " << 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 ; vector<double> Coeff = it->second ;
......
NPLib/MUST2/TMust2Physics.cxx
+ 64
− 64
View file @ afcf2b2d
...@@ -169,100 +169,100 @@ vector < TVector2 > TMust2Physics :: Match_X_Y(TMust2Data* Data) ...@@ -169,100 +169,100 @@ vector < TVector2 > TMust2Physics :: Match_X_Y(TMust2Data* Data)
bool TMust2Physics :: Match_Si_SiLi(int X, int Y , int PadNbr) bool TMust2Physics :: Match_Si_SiLi(int X, int Y , int PadNbr)
{ {
if( PadNbr == 1 if( PadNbr == 1
&& X<121 && X>93 && X<=121 && X>=93
&& Y<128 && Y>95 ) && Y<=128 && Y>=95 )
return true ; return true ;
else if( PadNbr == 2 else if( PadNbr == 2
&& X<121 && X>93 && X<=121 && X>=93
&& Y<100 && Y>65 ) && Y<=100 && Y>=65 )
return true ; return true ;
else if( PadNbr == 3 else if( PadNbr == 3
&& X<96 && X>61 && X<=96 && X>=61
&& Y<128 && Y>95 ) && Y<=128 && Y>=95 )
return true ; return true ;
else if( PadNbr == 4 else if( PadNbr == 4
&& X<96 && X>61 && X<=96 && X>=61
&& Y<100 && Y>65 ) && Y<=100 && Y>=65 )
return true ; return true ;
else if( PadNbr == 5 else if( PadNbr == 5
&& X<67 && X>30 && X<=67 && X>=30
&& Y<100 && Y>65) && Y<=100 && Y>=65)
return true ; return true ;
else if( PadNbr == 6 else if( PadNbr == 6
&& X<67 && X>30 && X<=67 && X>=30
&& Y<128 && Y>95 ) && Y<=128 && Y>=95 )
return true ; return true ;
else if( PadNbr == 7 else if( PadNbr == 7
&& X<35 && X>6 && X<=35 && X>=6
&& Y<100 && Y>65 ) && Y<=100 && Y>=65 )
return true ; return true ;
else if( PadNbr == 8 else if( PadNbr == 8
&& X<35 && X>6 && X<=35 && X>=6
&& Y<128 && Y>95 ) && Y<=128 && Y>=95 )
return true ; return true ;
else if( PadNbr == 9 else if( PadNbr == 9
&& X<121 && X>93 && X<=121 && X>=93
&& Y<31 && Y>1 ) && Y<=31 && Y>=1 )
return true ; return true ;
else if( PadNbr == 10 else if( PadNbr == 10
&& X<121 && X>93 && X<=121 && X>=93
&& Y<60 && Y>26 ) && Y<=60 && Y>=26 )
return true ; return true ;
else if( PadNbr == 11 else if( PadNbr == 11
&& X<96 && X>61 && X<=96 && X>=61
&& Y<31 && Y>1 ) && Y<=31 && Y>=1 )
return true ; return true ;
else if( PadNbr == 12 else if( PadNbr == 12
&& X<96 && X>61 && X<=96 && X>=61
&& Y<60 && Y>26) && Y<=60 && Y>=26)
return true ; return true ;
else if( PadNbr == 13 else if( PadNbr == 13
&& X<67 && X>30 && X<=67 && X>=30
&& Y<60 && Y>26 ) && Y<=60 && Y>=26 )
return true ; return true ;
else if( PadNbr == 14 else if( PadNbr == 14
&& X<67 && X>30 && X<=67 && X>=30
&& Y<31 && Y>1 ) && Y<=31 && Y>=1 )
return true ; return true ;
else if( PadNbr == 15 else if( PadNbr == 15
&& X<35 && X>6 && X<=35 && X>=6
&& Y<60 && Y>26 ) && Y<=60 && Y>=26 )
return true ; return true ;
else if( PadNbr == 16 else if( PadNbr == 16
&& X<35 && X>6 && X<=35 && X>=6
&& Y<31 && Y>1 ) && Y<=31 && Y>=1 )
return true ; return true ;
...@@ -275,100 +275,100 @@ bool TMust2Physics :: Match_Si_SiLi(int X, int Y , int PadNbr) ...@@ -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) bool TMust2Physics :: Match_Si_CsI(int X, int Y , int CristalNbr)
{ {
if( CristalNbr == 1 if( CristalNbr == 1
&& X<1 && X>1 && X<=71 && X>=27
&& Y<1 && Y>1 ) && Y<=101 && Y>=59 )
return true ; return true ;
else if( CristalNbr == 2 else if( CristalNbr == 2
&& X<1 && X>1 && X<=71 && X>=27
&& Y<1 && Y>1 ) && Y<=128 && Y>=90 )
return true ; return true ;
else if( CristalNbr == 3 else if( CristalNbr == 3
&& X<1 && X>1 && X<=35 && X>=1
&& Y<1 && Y>1 ) && Y<=101 && Y>=59 )
return true ; return true ;
else if( CristalNbr == 4 else if( CristalNbr == 4
&& X<1 && X>1 && X<=35 && X>=1
&& Y<1 && Y>1 ) && Y<=128 && Y>=90 )
return true ; return true ;
else if( CristalNbr == 5 else if( CristalNbr == 5
&& X<1 && X>1 && X<=104 && X>=60
&& Y<1 && Y>1 ) && Y<=71 && Y>=30 )
return true ; return true ;
else if( CristalNbr == 6 else if( CristalNbr == 6
&& X<1 && X>1 && X<=104 && X>=60
&& Y<1 && Y>1 ) && Y<=41 && Y>=1 )
return true ; return true ;
else if( CristalNbr == 7 else if( CristalNbr == 7
&& X<1 && X>1 && X<=128 && X>=90
&& Y<1 && Y>1 ) && Y<=71 && Y>=30 )
return true ; return true ;
else if( CristalNbr == 8 else if( CristalNbr == 8
&& X<1 && X>1 && X<=128 && X>=90
&& Y<1 && Y>1 ) && Y<=41 && Y>=1 )
return true ; return true ;
else if( CristalNbr == 9 else if( CristalNbr == 9
&& X<1 && X>1 && X<=71 && X>=27
&& Y<1 && Y>1 ) && Y<=71 && Y>=40 )
return true ; return true ;
else if( CristalNbr == 10 else if( CristalNbr == 10
&& X<1 && X>1 && X<=71 && X>=27
&& Y<1 && Y>1 ) && Y<=41 && Y>=1 )
return true ; return true ;
else if( CristalNbr == 11 else if( CristalNbr == 11
&& X<1 && X>1 && X<=35 && X>=1
&& Y<1 && Y>1 ) && Y<=71 && Y>=30 )
return true ; return true ;
else if( CristalNbr == 12 else if( CristalNbr == 12
&& X<1 && X>1 && X<=35 && X>=1
&& Y<1 && Y>1 ) && Y<=41 && Y>=1 )
return true ; return true ;
else if( CristalNbr == 13 else if( CristalNbr == 13
&& X<1 && X>1 && X<=104 && X>=60
&& Y<1 && Y>1 ) && Y<=101 && Y>=59 )
return true ; return true ;
else if( CristalNbr == 14 else if( CristalNbr == 14
&& X<1 && X>1 && X<=104 && X>=60
&& Y<1 && Y>1 ) && Y<=128 && Y>=90 )
return true ; return true ;
else if( CristalNbr == 15 else if( CristalNbr == 15
&& X<1 && X>1 && X<=128 && X>=90
&& Y<1 && Y>1 ) && Y<=101 && Y>=59 )
return true ; return true ;
else if( CristalNbr == 16 else if( CristalNbr == 16
&& X<1 && X>1 && X<=128 && X>=90
&& Y<1 && Y>1 ) && Y<=128 && Y>=90 )
return true ; return true ;
......
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