Adding PiKP-only histograms and eliminating a number of switches where histograms...

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

diff --git a/EMCAL/AliEMCALCalibReference.cxx b/EMCAL/AliEMCALCalibReference.cxx
index d0705f13d485c22194b12ea4f80529bda4370cb4..a131a4a97aee3a3ad8c67dec773f9bf3aba22956 100644 (file)
--- a/EMCAL/AliEMCALCalibReference.cxx
+++ b/EMCAL/AliEMCALCalibReference.cxx
@@ -81,7 +81,7 @@ void AliEMCALCalibReference::ReadTextCalibReferenceInfo(Int_t nSM, const TString
   for (Int_t i = 0; i < fNSuperModule; i++) {
     AliEMCALSuperModuleCalibReference * t = (AliEMCALSuperModuleCalibReference*) fSuperModuleData[i];
     if (!inputFile) {
-      printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; likely EOF..");
+      printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; likely EOF..\n");
       return;
     }
     inputFile >> iSM;
@@ -94,12 +94,21 @@ void AliEMCALCalibReference::ReadTextCalibReferenceInfo(Int_t nSM, const TString
     // second: additional info for LED Reference and SM temperature
     for (Int_t j=0; j<AliEMCALGeoParams::fgkEMCALLEDRefs; j++) {
       inputFile >> id >> iLEDRefHighLow >> rLEDRefAmp >> rLEDRefAmpRMS;
+      if (id<0 || id>(AliEMCALGeoParams::fgkEMCALLEDRefs-1) ) {
+       printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; LEDRef j %d id %d\n", j, id);
+       return;
+      }
       t->SetLEDRefHighLow(id, iLEDRefHighLow);
       t->SetLEDRefAmp(id, rLEDRefAmp);
       t->SetLEDRefAmpRMS(id, rLEDRefAmpRMS);
     }
+
     for (Int_t j=0; j<AliEMCALGeoParams::fgkEMCALTempSensors; j++) {
       inputFile >> id >> temperature >> temperatureRMS;
+      if (id<0 || id>(AliEMCALGeoParams::fgkEMCALTempSensors-1) ) {
+       printf("AliEMCALCalibReference::ReadCalibReferenceInfo - Error while reading input file; TempSensor j %d id %d\n", j, id);
+       return;
+      }
       t->SetTemperature(id, temperature);
       t->SetTemperatureRMS(id, temperatureRMS);
     }
@@ -109,6 +118,13 @@ void AliEMCALCalibReference::ReadTextCalibReferenceInfo(Int_t nSM, const TString
       inputFile >> iCol >> iRow 
                >> iHighLow >> rLEDAmp >> rLEDAmpRMS;
 
+      // check that input values are not out bounds
+      if (iCol<0 || iCol>(AliEMCALGeoParams::fgkEMCALCols-1) ||
+         iRow<0 || iRow>(AliEMCALGeoParams::fgkEMCALRows-1) ) {
+       printf("AliEMCALCalibReference::ReadCalibReferenceInfo - 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
@@ -423,7 +439,7 @@ AliEMCALCalibReference::~AliEMCALCalibReference()
 
 //____________________________________________________________________________
 AliEMCALSuperModuleCalibReference * AliEMCALCalibReference::GetSuperModuleCalibReferenceNum(Int_t supModIndex)const
-{
+{ // getter via index
   for (int i=0; i<fNSuperModule; i++) {
     AliEMCALSuperModuleCalibReference * t = (AliEMCALSuperModuleCalibReference*) fSuperModuleData[i];
     if (t->GetSuperModuleNum() == supModIndex) {