ATO-97 Function to connect CalPads trees into the common Tree as friend trees. naming...

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALCalibMapAPD.cxx

diff --git a/EMCAL/AliEMCALCalibMapAPD.cxx b/EMCAL/AliEMCALCalibMapAPD.cxx
index 038b72cc86b963f0442005ba52df2d26759e927d..51791fb6d68a1cdff05f6e3c35670409a8bc27fa 100644 (file)
--- a/EMCAL/AliEMCALCalibMapAPD.cxx
+++ b/EMCAL/AliEMCALCalibMapAPD.cxx
@@ -74,7 +74,7 @@ void AliEMCALCalibMapAPD::ReadTextCalibMapAPDInfo(Int_t nSM, const TString &txtF
   for (Int_t i = 0; i < fNSuperModule; i++) {
     AliEMCALSuperModuleCalibMapAPD * t = (AliEMCALSuperModuleCalibMapAPD*) fSuperModuleData[i];
     if (!inputFile) {
-      printf("AliEMCALCalibMapAPD::ReadCalibMapAPDInfo - Error while reading input file; likely EOF..");
+      printf("AliEMCALCalibMapAPD::ReadCalibMapAPDInfo - Error while reading input file; likely EOF..\n");
       return;
     }
     inputFile >> iSM;
@@ -87,6 +87,13 @@ void AliEMCALCalibMapAPD::ReadTextCalibMapAPDInfo(Int_t nSM, const TString &txtF
                >> parErr[0] >> parErr[1] >> parErr[2]
                >> iBreakDown >> darkCurrent;
 
+      // check that input values are not out bounds
+      if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) ||
+         iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) {
+       printf("AliEMCALCalibMapAPD::ReadCalibMapAPDInfo - Error while reading input file; j %d iCol %d iRow %d\n", j, iCol, iRow);
+      return;
+      }
+
       // assume that this info is already swapped and done for this basis?
       if (swapSides) {
        // C side, oriented differently than A side: swap is requested
@@ -327,7 +334,7 @@ AliEMCALCalibMapAPD::~AliEMCALCalibMapAPD()
 
 //____________________________________________________________________________
 AliEMCALSuperModuleCalibMapAPD * AliEMCALCalibMapAPD::GetSuperModuleCalibMapAPDNum(Int_t supModIndex)const
-{
+{ // getter via index
   for (int i=0; i<fNSuperModule; i++) {
     AliEMCALSuperModuleCalibMapAPD * t = (AliEMCALSuperModuleCalibMapAPD*) fSuperModuleData[i];
     if (t->GetSuperModuleNum() == supModIndex) {