Changes needed by the ZDC calibration (A.Colla)

diff --git a/STEER/AliRun.cxx b/STEER/AliRun.cxx
index 41e420148e0cf69df0e266c53712a7ece95ea7c7..086bf4610e783b88b02a26108aea198c7132f9a8 100644 (file)
--- a/STEER/AliRun.cxx
+++ b/STEER/AliRun.cxx
@@ -89,7 +89,6 @@ AliRun::AliRun():
   fPDGDB(0),  //Particle factory object
   fConfigFunction("\0"),
   fRandom(0),
-  fBaseFileName(),
   fRunLoader(0x0)
 {
   //
@@ -118,7 +117,6 @@ AliRun::AliRun(const AliRun& arun):
   fPDGDB(0),  //Particle factory object
   fConfigFunction("\0"),
   fRandom(0),
-  fBaseFileName(),
   fRunLoader(0x0)
 {
   //
@@ -146,7 +144,6 @@ AliRun::AliRun(const char *name, const char *title):
   fPDGDB(TDatabasePDG::Instance()),        //Particle factory object!
   fConfigFunction("Config();"),
   fRandom(new TRandom3()),
-  fBaseFileName(),
   fRunLoader(0x0)
 {
   //
@@ -966,3 +963,18 @@ void AliRun::SetDebug(Int_t level)
   AliWarning("Don't use this method any more, use AliLog instead");
   AliLog::SetClassDebugLevel("AliRun", level);
 }
+
+
+// added by Alberto Colla
+//_____________________________________________________________________________
+/*inline*/ Bool_t AliRun::IsFileAccessible(const char* fnam, EAccessMode mode)
+{ return !gSystem->AccessPathName(fnam,mode);}
+
+//______________________________________________________
+/*inline*/ Bool_t AliRun::IsFileAccessible(Char_t* name,EAccessMode mode)
+{
+  TString str = name; gSystem->ExpandPathName(str);
+  return !gSystem->AccessPathName(str.Data(),mode);
+}
+
+

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index 63eff8cc5e4749c9d331b12d50a47ad368267ee2..f0baa7a06bc580ac1872162785a35885602703ee 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -12,6 +12,7 @@
 //
 
 #include <TError.h>
+#include <TSystem.h>
 
 class TGeometry;
 class TParticle;
@@ -103,6 +104,14 @@ public:
    virtual  void  ResetHits();
    virtual  AliGenerator* Generator() const;
 
+
+
+// Added by Alberto Colla
+
+   Bool_t         IsFileAccessible(Char_t* name, EAccessMode mode = kFileExists);
+   static   Bool_t   IsFileAccessible(const char* fnam, EAccessMode mode = kFileExists);
+// Added by Alberto Colla
+
    //
    // End of MC Application
 
@@ -158,5 +167,5 @@ private:
 };
  
 R__EXTERN  AliRun *gAlice;
- 
+  
 #endif

diff --git a/ZDC/AliZDC.cxx b/ZDC/AliZDC.cxx
index 38c5c242f76a604f75284b534dfa83594456354f..3be63336b227daf3f74b21947e225841e6ad8159 100644 (file)
--- a/ZDC/AliZDC.cxx
+++ b/ZDC/AliZDC.cxx
@@ -29,7 +29,6 @@
 #include <TGeometry.h>
 #include <TNode.h>
 #include <TTree.h>
-#include <TFile.h>
 #include <TSystem.h>
 
 // --- AliRoot header files
@@ -479,7 +478,7 @@ void AliZDC::WriteCalibData(Int_t option)
   //
   const int kCompressLevel = 9;
   const char defname[] = "$(ALICE)/AliRoot/data/AliZDCCalib.root";
-  char* fnam = gAlice->GetZDCCalibFName();
+  char* fnam = GetZDCCalibFName();
   if (!fnam || fnam[0]=='\0') {
     fnam = gSystem->ExpandPathName(defname);
     Warning("WriteCalibData","No File Name is provided, using default %s",fnam);
@@ -501,7 +500,7 @@ void AliZDC::WriteCalibData(Int_t option)
 void AliZDC::LoadCalibData()
 {
   //
-  char* fnam = gAlice->GetZDCCalibFName();
+  char* fnam = GetZDCCalibFName();
   if (!fnam || fnam[0]=='\0') return; 
   if (!gAlice->IsFileAccessible(fnam)) {
     Error("LoadCalibData","ZDC Calibration Data file is not accessible, %s",fnam);

diff --git a/ZDC/AliZDC.h b/ZDC/AliZDC.h
index 2f204e105acb75c78a4b77b0330a442bd206ff7b..8572b0c51439e304737e97679e0c825023de2b40 100644 (file)
--- a/ZDC/AliZDC.h
+++ b/ZDC/AliZDC.h
@@ -9,6 +9,8 @@
 //  Manager and classes for set ZDC           //
 ////////////////////////////////////////////////
 
+#include <TSystem.h>
+
 #include "AliDetector.h"
 
 class AliZDCCalibData;
@@ -40,6 +42,13 @@ public:
 
 
 //Calibration methods (by Alberto Colla)
+// Albe
+
+public:
+  void SetZDCCalibFName(const char *name="$(ALICE)/AliRoot/data/AliZDCCalib.root");
+  char* GetZDCCalibFName() const;
+  TString       fZDCCalibFName;      //  Name of the ZDC calibration data
+
   void          CreateCalibData();
   void          WriteCalibData(Int_t option=TObject::kOverwrite);
   void          LoadCalibData();
@@ -61,4 +70,15 @@ protected:
  
 R__EXTERN  AliZDC *gZDC;
 
+
+// Calibration methods (by Alberto Colla)
+//_____________________________________________________________________________
+inline void AliZDC::SetZDCCalibFName(const char *name)  
+{fZDCCalibFName = name;        gSystem->ExpandPathName(fZDCCalibFName);}
+//_____________________________________________________________________________
+inline char* AliZDC::GetZDCCalibFName()  const {return (char*)fZDCCalibFName.Data();}
+
+// Calibration methods (by Alberto Colla)
+
+
 #endif

diff --git a/ZDC/ZDCbaseLinkDef.h b/ZDC/ZDCbaseLinkDef.h
index 8230eff1fb61ac13a827b7d039328cabb87e7d24..8e92ccecc35f1d993c18cbb67e163b55bb8df43c 100644 (file)
--- a/ZDC/ZDCbaseLinkDef.h
+++ b/ZDC/ZDCbaseLinkDef.h
@@ -10,5 +10,6 @@
  
 #pragma link C++ class  AliZDCDigit+;
 #pragma link C++ class  AliZDCRawStream+;
+#pragma link C++ class  AliZDCCalibData+;
 
 #endif

diff --git a/ZDC/libZDCbase.pkg b/ZDC/libZDCbase.pkg
index 7830944793127eb7ca413a81ce9a931d9e1457ae..175362e770ec6042f921279b252fd04497b785f6 100644 (file)
--- a/ZDC/libZDCbase.pkg
+++ b/ZDC/libZDCbase.pkg
@@ -1,7 +1,7 @@
 #-*- Mode: Makefile -*-
 # $Id$
 
-SRCS= AliZDCDigit.cxx AliZDCRawStream.cxx
+SRCS= AliZDCDigit.cxx AliZDCRawStream.cxx AliZDCCalibData.cxx
 
 HDRS= $(SRCS:.cxx=.h)