Updated to q

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

diff --git a/EMCAL/AliEMCALBiasAPD.cxx b/EMCAL/AliEMCALBiasAPD.cxx
index 8f9ac0254507a6242f2f7fc7b64ecea65dcda0d1..1814155e9a6b438a568650a117c8680297105297 100644 (file)
--- a/EMCAL/AliEMCALBiasAPD.cxx
+++ b/EMCAL/AliEMCALBiasAPD.cxx
@@ -39,6 +39,7 @@ AliEMCALBiasAPD::AliEMCALBiasAPD(const int nSM) :
     fSuperModuleData.Add(new AliEMCALSuperModuleBiasAPD(i));
   }
   fSuperModuleData.Compress(); // compress the TObjArray
+  fSuperModuleData.SetOwner(kTRUE); 
 }
 
 //____________________________________________________________________________
@@ -68,7 +69,7 @@ void AliEMCALBiasAPD::ReadTextBiasAPDInfo(Int_t nSM, const TString &txtFileName,
     AliEMCALSuperModuleBiasAPD * t = (AliEMCALSuperModuleBiasAPD*) fSuperModuleData[i];
 
     if (!inputFile) {
-      printf("AliEMCALBiasAPD::ReadBiasAPDInfo - Error while reading input file; likely EOF..");
+      printf("AliEMCALBiasAPD::ReadBiasAPDInfo - Error while reading input file; likely EOF..\n");
       return;
     }
     inputFile >> iSM;
@@ -77,6 +78,13 @@ void AliEMCALBiasAPD::ReadTextBiasAPDInfo(Int_t nSM, const TString &txtFileName,
     for (Int_t j=0; j<nAPDPerSM; j++) {
       inputFile >> iCol >> iRow >> iElecId >> iDAC >> voltage;
 
+      // check that input values are not out bounds
+      if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) ||
+         iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) {
+       printf("AliEMCALBiasAPD::ReadBiasAPDInfo - 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