Update for Ds

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

diff --git a/ITS/AliITSOnlineSPDscan.cxx b/ITS/AliITSOnlineSPDscan.cxx
index 02d501d0889b28500646f69880fdeec077302fca..d6b3a5bd1d794d7268d133624dbf10edd959938a 100644 (file)
--- a/ITS/AliITSOnlineSPDscan.cxx
+++ b/ITS/AliITSOnlineSPDscan.cxx
@@ -21,7 +21,7 @@
 #include "AliITSOnlineSPDHitArray.h"
 #include "AliITSOnlineSPDHitEvent.h"
 
-AliITSOnlineSPDscan::AliITSOnlineSPDscan(const Char_t *fileName) :
+AliITSOnlineSPDscan::AliITSOnlineSPDscan(const Char_t *fileName, Bool_t readFromGridFile) :
   fFile(NULL),
   fWrite(kFALSE),
   fCurrentStep(-1),
@@ -33,18 +33,45 @@ AliITSOnlineSPDscan::AliITSOnlineSPDscan(const Char_t *fileName) :
   // constructor, open file for reading or writing
   // look for a previously saved info object 
   // (if file not found create a new one and return, else read)
-  FILE* fp0 = fopen(fFileName.Data(), "r");
-  if (fp0 == NULL) {
+
+  for(Int_t ihs=0; ihs<6; ihs++){
+  fCurrentHitArray[ihs]=0x0; 
+  fCurrentHitEvent[ihs]=0x0;
+  }
+
+  Bool_t bRead = readFromGridFile;
+
+  if (!bRead) {
+    FILE* fp0 = fopen(fFileName.Data(), "r");
+    if (fp0 != NULL) {
+      bRead=kTRUE;
+      fclose(fp0);
+    }
+  }
+
+  if (bRead) { // open file for reading
+    fFile = TFile::Open(fFileName.Data(), "READ");
+    if (fFile==NULL) { // grid file not found, create new local default file
+      printf("ERROR: AliITSOnlineSPDscan: File %s not found! Creating 'test999.root' file instead\n",fFileName.Data());
+      // create default empty file:
+      fFileName = "test999.root";
+      fScanInfo = new AliITSOnlineSPDscanInfo();
+      fInfoModified=kTRUE;
+      fFile = new TFile(fFileName.Data(), "RECREATE");
+      fWrite=kTRUE;
+    }
+    else { // read from file (grid or local)
+      fWrite=kFALSE;
+      fFile->GetObject("AliITSOnlineSPDscanInfo", fScanInfo);
+    }
+  }
+  else { // create new local file
     fScanInfo = new AliITSOnlineSPDscanInfo();
+    fInfoModified=kTRUE;
     fFile = new TFile(fFileName.Data(), "RECREATE");
     fWrite=kTRUE;
   }
-  else {
-    fclose(fp0);
-    fFile = new TFile(fFileName.Data(), "READ");
-    fWrite=kFALSE;
-    fFile->GetObject("AliITSOnlineSPDscanInfo", fScanInfo);
-  }
+
   Init();
 }
 
@@ -57,6 +84,12 @@ AliITSOnlineSPDscan::AliITSOnlineSPDscan(const AliITSOnlineSPDscan& /*scan*/) :
   fScanInfo(NULL),
   fFileName(".")
 {
+
+  for(Int_t ihs=0; ihs<6; ihs++){
+  fCurrentHitArray[ihs]=0x0;
+  fCurrentHitEvent[ihs]=0x0;
+  }
+
   printf("This object should not be copied!");
 }
 
@@ -84,7 +117,8 @@ AliITSOnlineSPDscan::~AliITSOnlineSPDscan() {
     }
     fFile->Delete("AliITSOnlineSPDscanInfo;*");
     fFile->WriteTObject(fScanInfo, "AliITSOnlineSPDscanInfo");
-    fFile->Close();
+  }
+  if (fFile!=NULL) {
     delete fFile;
   }
 }