Set of fixes for the DA + updated documentation (Johny)

[u/mrichter/AliRoot.git] / ITS / ITSSPDFOda.cxx

diff --git a/ITS/ITSSPDFOda.cxx b/ITS/ITSSPDFOda.cxx
index 501cbc3a7fdb264fcae68b6e692f83c09cfbeba9..e8353474287f297d06dfe6307945fa10fb1cbac8 100644 (file)
--- a/ITS/ITSSPDFOda.cxx
+++ b/ITS/ITSSPDFOda.cxx
@@ -85,11 +85,9 @@ int main(int argc, char **argv) {
                                        "TStreamerInfo()");
   
   // turn off annoying warning messages
-  new AliLog;
-  AliLog::Instance()->SetGlobalDebugLevel(-20);
-  
-  
-  
+  // NB: Should not be handled here 
+  AliLog* logger = AliLog::GetRootLogger();
+  logger->SetGlobalDebugLevel(-20);
   
 // ********* STEP 0: Get configuration files from db (if there are any) , then read parameters*********  
   
@@ -239,6 +237,7 @@ int main(int argc, char **argv) {
             for(Int_t ihs =0; ihs < 6; ihs++) { // needed in the header to access the HS and ChipId info (in data it is different)
              for(Int_t ich =0; ich < 10; ich++){
                if(!str->GetFOHchipPresent(ihs, ich)) continue;
+                  info[eqId]->SetActiveChipsAndHS(ihs,ich);
                  Short_t measure[4] = {str->GetFOHMatrixID(),str->GetFOHpixelRow(), str->GetFOHpixelCol(), str->GetFOHchipCount(ihs,ich)}; 
                   fomanager[eqId]->AddMeasurement(dacs,measure,ihs,ich);                                            
              } // chip loop      
@@ -302,6 +301,7 @@ int main(int argc, char **argv) {
           if(dacs.GetSize() == 0) continue;
           for(Int_t idac =0; idac < dacs.GetSize() - 1; idac++) { // -1 (the last one is the quality flag)
             if(dacs.At(idac) >=0 ) {
+            
               dcsfile << ((analyzer->GetFOHandler())->GetFOscanInfo())->GetDACindex(idac) << ",";
               dcsfile << iff << ",";
               dcsfile << hs << ",";
@@ -343,7 +343,7 @@ int main(int argc, char **argv) {
       if(!iseq[eqId]) continue;   
       //printf("Preparing reference data for eq %d\n",eqId);
       
-      TString idf = Form("SPD_fo_scan_%d",eqId);
+      TString idf = Form("SPD_ref_fo_%d",eqId);
 #ifndef SPD_DA_OFF
       status = daqDA_FES_storeFile(files[eqId].Data(),idf.Data());
       if (status!=0) {
@@ -354,6 +354,21 @@ int main(int argc, char **argv) {
       idsFXSfile << Form("%s\n",idf.Data());   
     }
     
+
+
+  printf("Preparing id list file\n");
+  idsFXSfile.close();
+  TString idlist = "SPD_id_list";
+#ifndef SPD_DA_OFF
+  status = daqDA_FES_storeFile(idsFXSFileName.Data(),idlist.Data());
+  if (status!=0) {
+    printf("Failed to export file %s , status %d\n",idsFXSFileName.Data(),status);
+    return -1;
+  }
+#endif
+
+
+
     timer.Stop();
     timer.Print();   
     printf("DA finished.\n");