NewIO Implementation

diff --git a/VZERO/AliVZERO.cxx b/VZERO/AliVZERO.cxx
index 223ddb4fe0be9781c9cc462dac81c60359d1f40f..840d97a238cd249af0df32414561535a457f2948 100755 (executable)
--- a/VZERO/AliVZERO.cxx
+++ b/VZERO/AliVZERO.cxx
@@ -30,6 +30,7 @@
 
 #include "AliRun.h"
 #include "AliVZERO.h"
+#include "AliVZEROLoader.h"
 #include "AliVZEROdigit.h"
 #include "AliVZEROhit.h"
 
@@ -51,8 +52,6 @@ AliVZERO::AliVZERO(const char *name, const char *title)
    
   gAlice->AddHitList(fHits);
 
-//  fDigits       =  new TClonesArray("AliVZEROdigit",400) ; 
-
   fThickness    =  4.1;   // total thickness of the V0R box
   fThickness1   =  0.7;   // thickness of the thickest cell (2.5 in version 0)
   
@@ -143,3 +142,17 @@ void AliVZERO::SetMaxDestepAlu(Float_t p1)
 {
     fMaxDestepAlu = p1;
 }
+
+//___________________________________________
+AliLoader* AliVZERO::MakeLoader(const char* topfoldername)
+{ 
+  // builds VZEROgetter (AliLoader type)
+  // if detector wants to use customized getter, it must overload this method
+
+  Info("MakeLoader","Creating AliVZEROLoader. Top folder is %s.",topfoldername);
+  fLoader = new AliVZEROLoader(GetName(),topfoldername);
+  return fLoader;
+}
+
+
+

diff --git a/VZERO/AliVZERO.h b/VZERO/AliVZERO.h
index 0a8424a53c3faa4a412a0c98b6e32a7253b1dac3..e7826d4da4c62f83ed214e029d414267e9c0baab 100755 (executable)
--- a/VZERO/AliVZERO.h
+++ b/VZERO/AliVZERO.h
@@ -7,7 +7,9 @@
 //////////////////////////////////////////////////
 //  Manager and hits classes for set : VZERO    //
 //////////////////////////////////////////////////
- 
+
+#include "AliRun.h"
+#include "AliLoader.h" 
 #include "AliDetector.h"
 #include "AliHit.h"
 #include "TNamed.h"
@@ -30,6 +32,7 @@ public:
   virtual Int_t  DistanceToPrimitive(Int_t px, Int_t py);
   virtual Int_t  IsVersion() const = 0;
   virtual void   Init();
+  virtual AliLoader* MakeLoader(const char* topfoldername);
   virtual void   MakeBranch(Option_t *option) =0;
 //  virtual void   MakeBranch(Option_t *option);
   virtual void   DrawModule() {};

diff --git a/VZERO/AliVZEROLoader.cxx b/VZERO/AliVZEROLoader.cxx
new file mode 100644 (file)
index 0000000..74487e7
--- /dev/null
+++ b/VZERO/AliVZEROLoader.cxx
@@ -0,0 +1,23 @@
+#include "AliVZEROLoader.h"
+
+const TString AliVZEROLoader::fgkDefaultHitsFileName      = "VZERO.Hits.root";
+const TString AliVZEROLoader::fgkDefaultDigitsFileName    = "VZERO.Digits.root";
+
+ClassImp(AliVZEROLoader)
+AliVZEROLoader::AliVZEROLoader()
+ {
+ }
+/*****************************************************************************/ 
+AliVZEROLoader::AliVZEROLoader(const Char_t *name,const Char_t *topfoldername)
+ :AliLoader(name,topfoldername)
+{
+  if (GetDebug()) 
+   Info("AliVZEROLoader"," name = %s; topfolder = %s",name,topfoldername);
+}
+/*****************************************************************************/ 
+
+AliVZEROLoader::AliVZEROLoader(const Char_t *name,TFolder *topfolder)
+ :AliLoader(name,topfolder)
+ {
+ }
+

diff --git a/VZERO/AliVZEROLoader.h b/VZERO/AliVZEROLoader.h
new file mode 100644 (file)
index 0000000..3f923a1
--- /dev/null
+++ b/VZERO/AliVZEROLoader.h
@@ -0,0 +1,31 @@
+#ifndef ALIVZEROGETTER_H
+#define ALIVZEROGETTER_H
+
+//base class for loaders 
+//loader is common for reading data for all detectors
+//Each detector has a loader data member
+//loader is accessible via folder structure as well
+
+#include <AliLoader.h>
+
+class AliVZEROLoader: public AliLoader
+ {
+   public:
+    AliVZEROLoader();
+    AliVZEROLoader(const Char_t *name,const Char_t *topfoldername);
+    AliVZEROLoader(const Char_t *name,TFolder *topfolder);
+    
+    virtual ~AliVZEROLoader(){};//-----------------
+
+   protected:
+
+
+   private:
+    static const TString fgkDefaultHitsFileName;
+    static const TString fgkDefaultDigitsFileName;
+
+   public:
+     ClassDef(AliVZEROLoader,1)
+ };
+ 
+#endif

diff --git a/VZERO/VZEROLinkDef.h b/VZERO/VZEROLinkDef.h
index 49921ed0576d6a73697e12df04dcec6eb3ff49cb..35d059ac7ceea8a0d2aa53edabb007118e2bbb73 100755 (executable)
--- a/VZERO/VZEROLinkDef.h
+++ b/VZERO/VZEROLinkDef.h
@@ -11,5 +11,6 @@
 #pragma link C++ class  AliVZEROv2+;
 #pragma link C++ class  AliVZEROhit+;
 #pragma link C++ class  AliVZEROdigit+;
+#pragma link C++ class  AliVZEROLoader+;
 
 #endif

diff --git a/VZERO/libVZERO.pkg b/VZERO/libVZERO.pkg
index e90643fdb95469449941af439b98398c2d179884..f2c360ee387248f4fb2b6aa3f15d7c944ad794bc 100644 (file)
--- a/VZERO/libVZERO.pkg
+++ b/VZERO/libVZERO.pkg
@@ -1,12 +1,14 @@
 SRCS= \
+AliVZEROLoader.cxx \
 AliVZERO.cxx \
 AliVZEROv0.cxx \
 AliVZEROv2.cxx \
 AliVZEROhit.cxx \
 AliVZEROdigit.cxx
 
-HDRS= $(SRCS:.cxx=.h)
+HDRS:= $(SRCS:.cxx=.h)
 
-DHDR=VZEROLinkDef.h
+DHDR:=VZEROLinkDef.h
+
+EINCLUDE:= $(ALICE)/geant3/TGeant3 STRUCT STEER CONTAINERS
 
-EINCLUDE:= $(ALICE)/geant3/TGeant3 STRUCT STEER