Fixed creation of par files (Michele)

diff --git a/ANALYSIS/Makefile b/ANALYSIS/Makefile
index 3c32e7389fde5c4b8e55c261cb9bdcb3abca14a7..ab0a2b57ee8242c42840d3f3dd37f277dff3e5b5 100644 (file)
--- a/ANALYSIS/Makefile
+++ b/ANALYSIS/Makefile
@@ -24,6 +24,10 @@ ifneq ($(ANALYSIS_INCLUDE),)
    ALICEINC += -I../$(ANALYSIS_INCLUDE)
 endif
 
+ifneq ($(OADB_INCLUDE),)
+   ALICEINC += -I../$(OADB_INCLUDE)
+endif
+
 ifneq ($(ANALYSISalice_INCLUDE),)
    ALICEINC += -I../$(ANALYSISalice_INCLUDE)
 endif

diff --git a/OADB/AliOADBContainer.cxx b/OADB/AliOADBContainer.cxx
index 1c9cfba0c895c3c43642c70dbebb7d3920433fa9..25575d6d8763bdb1e3be4dfc7b32de57e8fbd2e4 100644 (file)
--- a/OADB/AliOADBContainer.cxx
+++ b/OADB/AliOADBContainer.cxx
@@ -244,8 +244,9 @@ void AliOADBContainer::WriteToFile(char* fname) const
 {
   //
   // Write object to file
-  TFile* f = new TFile(fname, "recreate");
+  TFile* f = new TFile(fname, "update");
   Write();
+  f->Purge();
   f->Close();
 }
 

diff --git a/OADB/Makefile b/OADB/Makefile
index f6e8ec2198e1be4d39c59970f22d82edb35a3f8a..fc3ec3f62e2a9988b240b4a8e0b520f290b214a5 100644 (file)
--- a/OADB/Makefile
+++ b/OADB/Makefile
@@ -13,6 +13,10 @@ endif
 
 ALICEINC = -I.
 
+ifneq ($(STEERBase_INCLUDE),)
+   ALICEINC += -I../$(STEERBase_INCLUDE)
+endif
+
 ifneq ($(OADB_INCLUDE),)
    ALICEINC += -I../$(OADB_INCLUDE) 
 endif

diff --git a/OADB/PROOF-INF.OADB/BUILD.sh b/OADB/PROOF-INF.OADB/BUILD.sh
index a8b7c3e935023d43833f0560d3f29bea3771ed7c..8b5aaa7d1762bc3f8c0d0632a22e1067beef3a82 100755 (executable)
--- a/OADB/PROOF-INF.OADB/BUILD.sh
+++ b/OADB/PROOF-INF.OADB/BUILD.sh
@@ -1,2 +1,2 @@
 #! /bin/sh
-
+make

diff --git a/OADB/PROOF-INF.OADB/SETUP.C b/OADB/PROOF-INF.OADB/SETUP.C
index bf8ce48ca42a79cab60dcfdd18215ffbde5bc14d..c7d3ef1bcf1d721e7184edbb747f475937732687 100644 (file)
--- a/OADB/PROOF-INF.OADB/SETUP.C
+++ b/OADB/PROOF-INF.OADB/SETUP.C
@@ -1,5 +1,18 @@
-void SETUP()
+Int_t SETUP()
 {
-   // Set our location, so that other packages can find us
-   gSystem->Setenv("OADB_PATH", "OADB");
+  // load library
+  gSystem->Load("libOADB");
+
+  // set include path
+  gROOT->ProcessLine(".include OADB");
+
+  // Set our location, so that other packages can find us
+  gSystem->Setenv("OADB_INCLUDE", "OADB");
+  
+  // path for the root files
+  gSystem->Setenv("OADB_PATH", "OADB");
+
+  // We're happy
+  return 0;
+
 }