Version where the process for HLT and vdrift on DAQ are off(Raphaelle)

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

diff --git a/EMCAL/AliEMCALCalibTimeDepCorrection.cxx b/EMCAL/AliEMCALCalibTimeDepCorrection.cxx
index e87ea54610af329e1270afcbbfd09837aa909b62..b7bd1b42f14f77d74566726373b7fef544a6d93a 100644 (file)
--- a/EMCAL/AliEMCALCalibTimeDepCorrection.cxx
+++ b/EMCAL/AliEMCALCalibTimeDepCorrection.cxx
@@ -122,7 +122,7 @@ void AliEMCALCalibTimeDepCorrection::ReadTextInfo(Int_t nSM, const TString &txtF
     AliEMCALSuperModuleCalibTimeDepCorrection * t = (AliEMCALSuperModuleCalibTimeDepCorrection*) fSuperModuleData[i];
 
     if (!inputFile) {
-      printf("AliEMCALCalibTimeDepCorrection::ReadTextInfo - Error while reading input file; likely EOF..");
+      printf("AliEMCALCalibTimeDepCorrection::ReadTextInfo - Error while reading input file; likely EOF..\n");
       return;
     }
     inputFile >> iSM;
@@ -131,6 +131,14 @@ void AliEMCALCalibTimeDepCorrection::ReadTextInfo(Int_t nSM, const TString &txtF
     for (Int_t j=0; j<nAPDPerSM; j++) {
       inputFile >> iCol >> iRow >> nCorr;
 
+      // check that input values are not out bounds
+      if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) ||
+         iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) || 
+         nCorr<0 ) {
+       printf("AliEMCALCalibTimeDepCorrection::ReadTextInfo - Error while reading input file; j %d iCol %d iRow %d nCorr %d\n", j, iCol, iRow, nCorr);
+      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
@@ -296,7 +304,7 @@ void AliEMCALCalibTimeDepCorrection::WriteRootInfo(const TString &rootFileName,
   TTree *treeCorr = new TTree("treeCorr","");
 
   // global part only has one entry
-  treeGlob->Branch("fStartTime", &fStartTime, "fStartTime/I"); // really unsigned int..
+  treeGlob->Branch("fStartTime", &fStartTime, "fStartTime/i"); // unsigned int..
   treeGlob->Branch("fNTimeBins", &fNTimeBins, "fNTimeBins/I");
   treeGlob->Branch("fTimeBinSize", &fTimeBinSize, "fTimeBinSize/I");
   treeGlob->Fill();
@@ -362,7 +370,7 @@ AliEMCALCalibTimeDepCorrection::~AliEMCALCalibTimeDepCorrection()
 
 //____________________________________________________________________________
 AliEMCALSuperModuleCalibTimeDepCorrection * AliEMCALCalibTimeDepCorrection::GetSuperModuleCalibTimeDepCorrectionNum(Int_t supModIndex)const
-{
+{ // getter via index
   for (int i=0; i<fNSuperModule; i++) {
     AliEMCALSuperModuleCalibTimeDepCorrection * t = (AliEMCALSuperModuleCalibTimeDepCorrection*) fSuperModuleData[i];
     if (t->GetSuperModuleNum() == supModIndex) {