]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ZDC/AliZDCPreprocessor.cxx
Protection instead fatal in case of absent galice.root or Kinematics.root
[u/mrichter/AliRoot.git] / ZDC / AliZDCPreprocessor.cxx
index aa118c4114ce48b488c98bb57ffeee07994084fe..c44776c70e2c7a3eb4f16afe81b993d49bbbe480 100644 (file)
 #include "AliAlignObjParams.h"
 #include "AliLog.h"
 #include "AliZDCDataDCS.h"
+#include "AliZDCChMap.h"
 #include "AliZDCPedestals.h"
+#include "AliZDCLaserCalib.h"
 #include "AliZDCCalib.h"
-#include "AliZDCRecParam.h"
 
 /////////////////////////////////////////////////////////////////////
 //                                                                //
@@ -34,8 +35,15 @@ AliZDCPreprocessor::AliZDCPreprocessor(AliShuttleInterface* shuttle) :
   fData(0)
 {
   // constructor
+  AddRunType("STANDALONE_PEDESTAL");
+  AddRunType("STANDALONE_LASER");
+  AddRunType("STANDALONE_EMD");
+  AddRunType("STANDALONE_COSMIC");
+  AddRunType("STANDALONE_BC");
+  AddRunType("PHYSICS");
 }
 
+
 //______________________________________________________________________________________________
 AliZDCPreprocessor::~AliZDCPreprocessor()
 {
@@ -62,24 +70,128 @@ void AliZDCPreprocessor::Initialize(Int_t run, UInt_t startTime,
        fData = new AliZDCDataDCS(fRun, fStartTime, fEndTime);
 }
 
+//______________________________________________________________________________________________
+UInt_t AliZDCPreprocessor::ProcessChMap(TString runType)
+{ 
+  // Reading the file for mapping from FXS
+  TList* daqSource = GetFileSources(kDAQ, runType.Data());
+  if(!daqSource){
+    AliError(Form("No sources run %d for run type %s!", fRun, runType.Data()));
+    return 1;
+  }
+  Log("\t List of sources "); daqSource->Print();
+  //
+  TIter iter(daqSource);
+  TObjString* source = 0;
+  Int_t isou=0;
+  Int_t res=999;
+  Int_t readMap[48][6]; 
+  //
+  while((source = dynamic_cast<TObjString*> (iter.Next()))){
+     Log(Form("\n\t Getting file #%d\n",++isou));
+     TString fileName = "ZDCChMapping.dat";
+
+     if(fileName.Length() <= 0){
+       Log(Form("No file from source %s!", source->GetName()));
+       return 1;
+     }
+     // --- Reading file with calibration data
+     //const char* fname = fileName.Data();
+     if(fileName){
+       FILE *file;
+       if((file = fopen(fileName,"r")) == NULL){
+        printf("Cannot open file %s \n",fileName.Data());
+         return 1;
+       }
+       Log(Form("File %s connected to process data for ADC mapping", fileName.Data()));
+       //
+       for(Int_t j=0; j<48; j++){        
+           for(Int_t k=0; k<6; k++){
+             fscanf(file,"%d",&readMap[j][k]);
+           }
+       }
+       fclose(file);
+     }
+     else{
+       Log(Form("File %s not found", fileName.Data()));
+       return 1;
+     }
+  }
+  delete daqSource; daqSource=0;
+  
+  // Store the currently read map ONLY IF it is different
+  // from the entry in the OCDB
+  Bool_t updateOCDB = kFALSE;
+  
+  AliCDBEntry *cdbEntry = GetFromOCDB("Calib","ChMap");
+  if(!cdbEntry){
+    Log("\t AliZDCPreprocessor -> WARNING! No CDB entry for ch. mapping\n");
+    updateOCDB = kTRUE;
+  }
+  else{
+    AliZDCChMap *chMap = (AliZDCChMap*) cdbEntry->GetObject();
+    for(Int_t i=0; i<48; i++){
+      if(  (readMap[i][1] == chMap->GetADCModule(i)) 
+        && (readMap[i][2] == chMap->GetADCChannel(i)) 
+       && (readMap[i][4] == chMap->GetDetector(i)) 
+       && (readMap[i][5] == chMap->GetSector(i))){
+        updateOCDB = kFALSE;
+      }
+      else updateOCDB = kTRUE;
+    }
+  }
+  //
+  if(updateOCDB==kTRUE){
+    Log("\t AliZDCPreprocessor -> A new entry ZDC/Calib/ChMap will be created");
+    //
+    // --- Initializing mapping calibration object
+    AliZDCChMap *mapCalib = new AliZDCChMap("ZDC");
+    // Writing channel map in the OCDB
+    for(Int_t k=0; k<48; k++){
+      mapCalib->SetADCModule(k,readMap[k][1]);
+      mapCalib->SetADCChannel(k,readMap[k][2]);
+      mapCalib->SetDetector(k,readMap[k][4]);
+      mapCalib->SetSector(k,readMap[k][5]);
+    }
+    //mapCalib->Print("");
+    // 
+    AliCDBMetaData metaData;
+    metaData.SetBeamPeriod(0);
+    metaData.SetResponsible("Chiara Oppedisano");
+    metaData.SetComment("Filling AliZDCChMap object");  
+    //
+    res = Store("Calib","ChMap",mapCalib, &metaData, 0, 1);
+  }
+  else{
+    Log("\t AliZDCPreprocessor -> ZDC/Calib/ChMap entry in OCDB is valid and won't be updated\n");
+    res = kTRUE;
+  }
+
+  
+  return res;
+
+}
+
 //______________________________________________________________________________________________
 UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
 {
   // *************** From DCS ******************
   // Fills data into a AliZDCDataDCS object
   if(!dcsAliasMap) return 1;
-
+  printf("Processing data from DCS\n");
+  
   // The processing of the DCS input data is forwarded to AliZDCDataDCS
   Float_t dcsValues[28]; // DCSAliases=28
-  fData->ProcessData(*dcsAliasMap, dcsValues);
+  fData->SetCalibData(dcsValues);
+  fData->ProcessData(*dcsAliasMap);
   // Store DCS data for reference
   AliCDBMetaData metadata;
   metadata.SetResponsible("Chiara Oppedisano");
   metadata.SetComment("DCS data for ZDC");
   Bool_t resDCSRef = kTRUE;
   resDCSRef = StoreReferenceData("DCS","Data",fData,&metadata);
-  //dcsAliasMap->Print("");
-  //
+  dcsAliasMap->Print("");
+
   // --- Writing ZDC table positions into alignment object
   TClonesArray *array = new TClonesArray("AliAlignObjParams",10);
   TClonesArray &alobj = *array;
@@ -90,10 +202,13 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   Double_t dyZP1 = (Double_t) (dcsValues[1]/10.);
   Double_t dyZN2 = (Double_t) (dcsValues[2]/10.);
   Double_t dyZP2 = (Double_t) (dcsValues[3]/10.);
-  const char *n1ZDC="ZDC/NeutronZDC1";
-  const char *p1ZDC="ZDC/ProtonZDC1";
-  const char *n2ZDC="ZDC/NeutronZDC2";
-  const char *p2ZDC="ZDC/ProtonZDC2";
+  //
+  
+  const char *n1ZDC="ZDC/NeutronZDC_C";  
+  const char *p1ZDC="ZDC/ProtonZDC_C";
+  const char *n2ZDC="ZDC/NeutronZDC_A";
+  const char *p2ZDC="ZDC/ProtonZDC_A";
+  //
   UShort_t iIndex=0;
   AliGeomManager::ELayerID iLayer = AliGeomManager::kInvalidLayer;
   UShort_t volid = AliGeomManager::LayerToVolUID(iLayer,iIndex);
@@ -102,6 +217,7 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   new(alobj[1]) AliAlignObjParams(p1ZDC, volid, dx, dyZP1, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[2]) AliAlignObjParams(n2ZDC, volid, dx, dyZN2, dz, dpsi, dtheta, dphi, kTRUE);
   new(alobj[3]) AliAlignObjParams(p2ZDC, volid, dx, dyZP2, dz, dpsi, dtheta, dphi, kTRUE);
+  
   // save in CDB storage
   AliCDBMetaData md;
   md.SetResponsible("Chiara Oppedisano");
@@ -110,13 +226,53 @@ UInt_t AliZDCPreprocessor::Process(TMap* dcsAliasMap)
   resultAl = Store("Align","Data", array, &md, 0, 0);
   
 // *************** From DAQ ******************
-Bool_t resPedCal = kTRUE, resECal = kTRUE, resRecPar = kTRUE;
+Bool_t resChMap=kTRUE, resPedCal=kTRUE, resLaserCal=kTRUE, resECal=kTRUE;
+// 
+const char* beamType = GetRunParameter("beamType");
+TString runType = GetRunType();
+printf("\n\t AliZDCPreprocessor -> beamType %s\n",beamType);
+printf("\t AliZDCPreprocessor -> runType  %s\n\n",runType.Data());
+
+if(strcmp(beamType,"p-p")==0){
+   
+   // --- Cheking if there is already the entry in the OCDB
+   AliCDBEntry *cdbEntry = GetFromOCDB("Calib", "EMDCalib");
+   if(!cdbEntry){   
+     printf("\t AliZDCPreprocessor -> ZDC/Calib/EMDCalib entry will be created\n");
+     // --- Initializing calibration object
+     AliZDCCalib *eCalib = new AliZDCCalib("ZDC");
+     //
+     for(Int_t j=0; j<6; j++) eCalib->SetEnCalib(j,1.);
+     for(Int_t j=0; j<5; j++){  
+        eCalib->SetZN1EqualCoeff(j, 1.);
+        eCalib->SetZP1EqualCoeff(j, 1.);
+        eCalib->SetZN2EqualCoeff(j, 1.);
+        eCalib->SetZP2EqualCoeff(j, 1.);  
+     }
+     //eCalib->Print("");
+     // 
+     AliCDBMetaData metaData;
+     metaData.SetBeamPeriod(0);
+     metaData.SetResponsible("Chiara Oppedisano");
+     metaData.SetComment("AliZDCCalib object");  
+     //
+     resECal = Store("Calib","EMDCalib",eCalib, &metaData, 0, 1);
+   }
+   else{
+     printf("\t AliZDCPreprocessor -> ZDC/Calib/EMDCalib object already existing in OCDB!!!\n");
+     resECal = kTRUE;
+   }
+}
+// ******************************************
+//   ZDC ADC channel mapping
+// ******************************************
+resChMap = ProcessChMap(runType);
+// 
 // *****************************************************
 // [a] PEDESTALS -> Pedestal subtraction
 // *****************************************************
-TString runType = GetRunType();
-printf("\n\t AliZDCPreprocessor -> runType detected %s\n\n",runType.Data());
-if(runType == "STANDALONE_PEDESTAL"){
+// 
+if(runType=="STANDALONE_PEDESTAL"){
   TList* daqSources = GetFileSources(kDAQ, "PEDESTALS");
   if(!daqSources){
     Log(Form("No source for STANDALONE_PEDESTAL run %d !", fRun));
@@ -148,24 +304,25 @@ if(runType == "STANDALONE_PEDESTAL"){
           return 1;
          }
          Log(Form("File %s connected to process pedestal data", pedFileName));
-         Float_t pedVal[(3*knZDCch)][3];
-         for(Int_t i=0; i<(3*knZDCch); i++){
-            for(Int_t j=0; j<3; j++){
-               fscanf(file,"%f",&pedVal[i][j]);
-              //if(j==1) printf("pedVal[%d] -> %f, %f \n",i,pedVal[i][0],pedVal[i][1]);
+         Float_t pedVal[(2*knZDCch)][2];
+         for(Int_t k=0; k<(2*knZDCch); k++){
+            for(Int_t j=0; j<2; j++){
+               fscanf(file,"%f",&pedVal[k][j]);
+              //if(j==1) printf("pedVal[%d] -> %f, %f \n",k,pedVal[k][0],pedVal[k][1]);
             }
-            if(i<knZDCch){
-              pedCalib->SetMeanPed(i,pedVal[i][1]);
-              pedCalib->SetMeanPedWidth(i,pedVal[i][2]);
+            if(k<knZDCch){
+              pedCalib->SetMeanPed(k,pedVal[k][0]);
+              pedCalib->SetMeanPedWidth(i,pedVal[k][1]);
             }
-            else if(i>=knZDCch && i<(2*knZDCch)){
-              pedCalib->SetOOTPed(i-knZDCch,pedVal[i][1]);
-              pedCalib->SetOOTPedWidth(i-knZDCch,pedVal[i][2]);
+            else if(k>=knZDCch && k<(2*knZDCch)){
+              pedCalib->SetOOTPed(k-knZDCch,pedVal[k][0]);
+              pedCalib->SetOOTPedWidth(k-knZDCch,pedVal[k][1]);
             }
-            else if(i>=(2*knZDCch) && i<(3*knZDCch)){
-              pedCalib->SetPedCorrCoeff(i-(2*knZDCch),pedVal[i][1],pedVal[i][2]);
+            else if(k>=(2*knZDCch) && k<(3*knZDCch)){
+              pedCalib->SetPedCorrCoeff(k-(2*knZDCch),pedVal[k][0],pedVal[k][1]);
             }
          }
+        fclose(file);
        }
        else{
           Log(Form("File %s not found", pedFileName));
@@ -176,7 +333,7 @@ if(runType == "STANDALONE_PEDESTAL"){
       // 
       AliCDBMetaData metaData;
       metaData.SetBeamPeriod(0);
-      metaData.SetResponsible("Chiara");
+      metaData.SetResponsible("Chiara Oppedisano");
       metaData.SetComment("Filling AliZDCPedestals object");  
       //
       resPedCal = Store("Calib","Pedestals",pedCalib, &metaData, 0, 1);
@@ -184,140 +341,139 @@ if(runType == "STANDALONE_PEDESTAL"){
   delete daqSources; daqSources = 0;
 }
 // *****************************************************
-// [b] EMD EVENTS -> Energy calibration and equalization
+// [b] STANDALONE_LASER EVENTS -> Signal stability
 // *****************************************************
-else if(runType == "STANDALONE_EMD"){
-  TList* daqSources = GetFileSources(kDAQ, "EMDCALIB");
+else if(runType=="STANDALONE_LASER"){
+  TList* daqSources = GetFileSources(kDAQ, "LASER");
   if(!daqSources){
-    AliError(Form("No sources for STANDALONE_EMD run %d !", fRun));
+    AliError(Form("No sources for STANDALONE_LASER run %d !", fRun));
     return 1;
   }
-  Log("\t List of sources for STANDALONE_EMD");
+  Log("\t List of sources for STANDALONE_LASER");
   daqSources->Print();
   //
   TIter iter2(daqSources);
   TObjString* source = 0;
-  Int_t j=0;
+  Int_t i=0;
   while((source = dynamic_cast<TObjString*> (iter2.Next()))){
-       Log(Form("\n\t Getting file #%d\n",++j));
-       TString stringEMDFileName = GetFile(kDAQ, "EMDCALIB", source->GetName());
-       if(stringEMDFileName.Length() <= 0){
-         Log(Form("No EMDCALIB file from source %s!", source->GetName()));
+       Log(Form("\n\t Getting file #%d\n",++i));
+       TString stringLASERFileName = GetFile(kDAQ, "LASER", source->GetName());
+       if(stringLASERFileName.Length() <= 0){
+         Log(Form("No LASER file from source %s!", source->GetName()));
         return 1;
        }
        // --- Initializing pedestal calibration object
-       AliZDCCalib *eCalib = new AliZDCCalib("ZDC");
+       AliZDCLaserCalib *lCalib = new AliZDCLaserCalib("ZDC");
        // --- Reading file with pedestal calibration data
-       const char* emdFileName = stringEMDFileName.Data();
-       if(emdFileName){
+       const char* laserFileName = stringLASERFileName.Data();
+       if(laserFileName){
         FILE *file;
-        if((file = fopen(emdFileName,"r")) == NULL){
-          printf("Cannot open file %s \n",emdFileName);
+        if((file = fopen(laserFileName,"r")) == NULL){
+          printf("Cannot open file %s \n",laserFileName);
           return 1;
         }
-        Log(Form("File %s connected to process data from EM dissociation events", emdFileName));
+        Log(Form("File %s connected to process data from LASER events", laserFileName));
         //
-        Float_t fitValEMD[6]; Float_t equalCoeff[5][4];
-        Float_t calibVal[4];
-        for(Int_t j=0; j<10; j++){         
-          if(j<6){
-            fscanf(file,"%f",&fitValEMD[j]);
-             if(j<4){
-              calibVal[j] = 2.76/fitValEMD[j];
-              eCalib->SetEnCalib(j,calibVal[j]);
-            }
-            else eCalib->SetEnCalib(j,fitValEMD[j]);
-          }
-          else{
-            for(Int_t k=0; k<5; k++){
-               fscanf(file,"%f",&equalCoeff[j][k]);
-               if(j==6) eCalib->SetZN1EqualCoeff(k, equalCoeff[j][k]);
-               else if(j==7) eCalib->SetZP1EqualCoeff(k, equalCoeff[j][k]);
-               else if(j==8) eCalib->SetZN2EqualCoeff(k, equalCoeff[j][k]);
-               else if(j==9) eCalib->SetZP2EqualCoeff(k, equalCoeff[j][k]);  
-             }
-          }
-         }
+        Float_t ivalRead[22][4]; 
+        for(Int_t j=0; j<22; j++){
+            for(Int_t k=0; k<4; k++){
+              fscanf(file,"%f",&ivalRead[j][k]);
+             //printf(" %d %1.0f  ",k, ivalRead[j][k]);
+           }
+           lCalib->SetDetector(j, ivalRead[j][0]);
+           lCalib->SetSector(j, ivalRead[j][1]);
+           lCalib->SetfPMValue(j, ivalRead[j][2]);
+           lCalib->SetfPMWidth(j, ivalRead[j][3]);
+        }
+        fclose(file);
        }
        else{
-         Log(Form("File %s not found", emdFileName));
+         Log(Form("File %s not found", laserFileName));
          return 1;
        }
-       //calibdata->Print("");
-      // 
-      AliCDBMetaData metaData;
-      metaData.SetBeamPeriod(0);
-      metaData.SetResponsible("Chiara");
-      metaData.SetComment("Filling AliZDCCalib object");  
-      //
-      resECal = Store("Calib","Calib",eCalib, &metaData, 0, 1);
+       //lCalib->Print("");
+       // 
+       AliCDBMetaData metaData;
+       metaData.SetBeamPeriod(0);
+       metaData.SetResponsible("Chiara Oppedisano");
+       metaData.SetComment("Filling AliZDCLaserCalib object");  
+       //
+       resLaserCal = Store("Calib","LaserCalib",lCalib, &metaData, 0, 1);
   }
+  
 }
-// ********************************************************
-// [c] PHYSICS RUNS -> Parameters needed for reconstruction
-// ********************************************************
-else if(runType == "PHYSICS"){
-  TList* daqSources = GetFileSources(kDAQ, "PHYSICS");
+// *****************************************************
+// [c] EMD EVENTS -> Energy calibration and equalization
+// *****************************************************
+else if(runType=="STANDALONE_EMD" && strcmp(beamType,"Pb-Pb")==0){
+  TList* daqSources = GetFileSources(kDAQ, "EMDCALIB");
   if(!daqSources){
-    AliError(Form("No sources for PHYSICS run %d !", fRun));
+    AliError(Form("No sources for STANDALONE_EMD run %d !", fRun));
     return 1;
   }
-  Log("\t List of sources for PHYSICS");
+  Log("\t List of sources for STANDALONE_EMD");
   daqSources->Print();
   //
   TIter iter2(daqSources);
   TObjString* source = 0;
-  Int_t j=0;
+  Int_t i=0;
   while((source = dynamic_cast<TObjString*> (iter2.Next()))){
-       Log(Form("\n\t Getting file #%d\n",++j));
-       TString stringPHYSFileName = GetFile(kDAQ, "PHYSICS", source->GetName());
-       if(stringPHYSFileName.Length() <= 0){
-         Log(Form("No PHYSICS file from source %s!", source->GetName()));
-        return 1;
-       }
-       // --- Initializing pedestal calibration object
-       AliZDCRecParam *recCalib = new AliZDCRecParam("ZDC");
-       // --- Reading file with pedestal calibration data
-       const char* physFileName = stringPHYSFileName.Data();
-       if(physFileName){
-        FILE *file;
-        if((file = fopen(physFileName,"r")) == NULL){
-          printf("Cannot open file %s \n",physFileName);
-          return 1;
-        }
-        Log(Form("File %s connected to process data from PHYSICS runs", physFileName));
-        //
-        Float_t physRecParam[10]; 
-        for(Int_t j=0; j<10; j++) fscanf(file,"%f",&physRecParam[j]);
-        recCalib->SetZEMEndValue(physRecParam[0]);
-        recCalib->SetZEMCutFraction(physRecParam[1]);
-        recCalib->SetDZEMSup(physRecParam[2]);
-        recCalib->SetDZEMInf(physRecParam[3]);
-        recCalib->SetEZN1MaxValue(physRecParam[4]);
-        recCalib->SetEZP1MaxValue(physRecParam[5]);
-        recCalib->SetEZDC1MaxValue(physRecParam[6]);
-        recCalib->SetEZN2MaxValue(physRecParam[7]);
-        recCalib->SetEZP2MaxValue(physRecParam[8]);
-        recCalib->SetEZDC2MaxValue(physRecParam[9]);
-       }
-       else{
-         Log(Form("File %s not found", physFileName));
-         return 1;
-       }
-       //calibdata->Print("");
+      Log(Form("\n\t Getting file #%d\n",++i));
+      TString stringEMDFileName = GetFile(kDAQ, "EMDCALIB", source->GetName());
+      if(stringEMDFileName.Length() <= 0){
+        Log(Form("No EMDCALIB file from source %s!", source->GetName()));
+        return 1;
+      }
+      // --- Initializing pedestal calibration object
+      AliZDCCalib *eCalib = new AliZDCCalib("ZDC");
+      // --- Reading file with pedestal calibration data
+      const char* emdFileName = stringEMDFileName.Data();
+      if(emdFileName){
+        FILE *file;
+        if((file = fopen(emdFileName,"r")) == NULL){
+          printf("Cannot open file %s \n",emdFileName);
+          return 1;
+        }
+        Log(Form("File %s connected to process data from EM dissociation events", emdFileName));
+        //
+        Float_t fitValEMD[6]; Float_t equalCoeff[5][4];
+        Float_t calibVal[4];
+        for(Int_t j=0; j<10; j++){        
+          if(j<6){
+            fscanf(file,"%f",&fitValEMD[j]);
+            if(j<4){
+              calibVal[j] = 2.76/fitValEMD[j];
+              eCalib->SetEnCalib(j,calibVal[j]);
+            }
+            else eCalib->SetEnCalib(j,fitValEMD[j]);
+          }
+          else{
+            for(Int_t k=0; k<5; k++){
+               fscanf(file,"%f",&equalCoeff[j][k]);
+               if(j==6)      eCalib->SetZN1EqualCoeff(k, equalCoeff[j][k]);
+               else if(j==7) eCalib->SetZP1EqualCoeff(k, equalCoeff[j][k]);
+               else if(j==8) eCalib->SetZN2EqualCoeff(k, equalCoeff[j][k]);
+               else if(j==9) eCalib->SetZP2EqualCoeff(k, equalCoeff[j][k]);  
+            }
+          }
+        }
+        fclose(file);
+      }
+      else{
+        Log(Form("File %s not found", emdFileName));
+        return 1;
+      }
+      //eCalib->Print("");
       // 
       AliCDBMetaData metaData;
       metaData.SetBeamPeriod(0);
-      metaData.SetResponsible("Chiara");
+      metaData.SetResponsible("Chiara Oppedisano");
       metaData.SetComment("Filling AliZDCCalib object");  
       //
-      resRecPar = Store("Calib","RecParam",recCalib, &metaData, 0, 1);
+      resECal = Store("Calib","EMDCalib",eCalib, &metaData, 0, 1);
   }
-} 
-else {
-  Log(Form("Nothing to do: run type is %s", runType.Data()));
-  return 0;
-} 
+}
+
 
   // note that the parameters are returned as character strings!
   const char* nEvents = GetRunParameter("totalEvents");
@@ -325,13 +481,14 @@ else {
   else Log(Form("Number of events not put in logbook!"));
  
   UInt_t result = 0;
-  if(resDCSRef==kFALSE || resultAl==kFALSE || 
-     resPedCal==kFALSE || resECal==kFALSE || resRecPar==kFALSE){
-    if(resDCSRef == kFALSE) result = 1;
-    else if(resultAl == kFALSE)  result = 2;
-    else if(resPedCal == kFALSE) result = 3;
-    else if(resECal == kFALSE)   result = 4;
-    else if(resRecPar == kFALSE) result = 5;
+  if(resDCSRef==kFALSE || resultAl==kFALSE || resPedCal==kFALSE ||
+     resLaserCal==kFALSE || resECal==kFALSE || resChMap==kFALSE){
+    if(resDCSRef == kFALSE)        result = 1;
+    else if(resultAl == kFALSE)    result = 2;
+    else if(resChMap == kFALSE)    result = 3;
+    else if(resPedCal == kFALSE)   result = 4;
+    else if(resLaserCal == kFALSE) result = 5;
+    else if(resECal == kFALSE)     result = 6;
   }
   
   return result;