new class AliMUONLoader

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 63e9994f370828629f67629169ccf4b09c4e8d80..a0cb78fb1046fbea4598d39855aba852e5042bdc 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -49,6 +49,7 @@
 #include "AliHeader.h"
 #include "AliHitMap.h"
 #include "AliLoader.h"
 #include "AliHeader.h"
 #include "AliHitMap.h"
 #include "AliLoader.h"

+#include "AliMUONLoader.h"

 #include "AliMUON.h"
 #include "AliMUONChamberTrigger.h"
 #include "AliMUONClusterFinderVS.h"
 #include "AliMUON.h"
 #include "AliMUONChamberTrigger.h"
 #include "AliMUONClusterFinderVS.h"


@@ -755,7 +756,22 @@ void AliMUON::SDigits2Digits()
     fLoader->TreeD()->Reset();
 }
 
     fLoader->TreeD()->Reset();
 }
 

-//___________________________________________
+
+//__________________________________________________________________________
+AliLoader* AliMUON::MakeLoader(const char* topfoldername)
+{ 
+//builds standard getter (AliLoader type)
+//if detector wants to use castomized getter, it must overload this method
+
+ if (GetDebug())
+   Info("MakeLoader",
+        "Creating standard getter for detector %s. Top folder is %s.",
+         GetName(),topfoldername);
+     
+ fLoader = new AliMUONLoader(GetName(),topfoldername);
+ return fLoader;
+}
+//__________________________________________________________________________

 // To be removed
 void AliMUON::MakePadHits(Float_t xhit,Float_t yhit, Float_t zhit,
                          Float_t eloss, Float_t tof,  Int_t idvol)
 // To be removed
 void AliMUON::MakePadHits(Float_t xhit,Float_t yhit, Float_t zhit,
                          Float_t eloss, Float_t tof,  Int_t idvol)

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 2d8c25bb53d642a5e53755f0f42e5fab7b2ceea5..c2c32cf128469d9d29f466c435c37297c97c3de9 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -12,6 +12,7 @@
 ////////////////////////////////////////////////
 #include "AliDetector.h"
 
 ////////////////////////////////////////////////
 #include "AliDetector.h"
 

+class AliLoader;

 class AliMUONChamber;
 class AliMUONLocalTrigger;
 class AliMUONGlobalTrigger;
 class AliMUONChamber;
 class AliMUONLocalTrigger;
 class AliMUONGlobalTrigger;


@@ -58,13 +59,16 @@ class AliMUON : public  AliDetector {
     TClonesArray  *PadHits() {return fPadHits;}
     TClonesArray  *LocalTrigger() {return fLocalTrigger;}
     TClonesArray  *GlobalTrigger() {return fGlobalTrigger;}
     TClonesArray  *PadHits() {return fPadHits;}
     TClonesArray  *LocalTrigger() {return fLocalTrigger;}
     TClonesArray  *GlobalTrigger() {return fGlobalTrigger;}

-    virtual void   MakeBranch(Option_t *opt=" ");
-    virtual void   MakeBranchInTreeD(TTree *treeD, const char *file=0);
-    void           SetTreeAddress();
-    virtual void   ResetHits();
-    virtual void   ResetDigits();
-    virtual void   ResetTrigger();
-    virtual void   ResetRawClusters();
+
+    virtual AliLoader* MakeLoader(const char* topfoldername); //builds standard getter (AliLoader type)
+
+    virtual void       MakeBranch(Option_t *opt=" ");
+    virtual void       MakeBranchInTreeD(TTree *treeD, const char *file=0);
+    void               SetTreeAddress();
+    virtual void       ResetHits();
+    virtual void       ResetDigits();
+    virtual void       ResetTrigger();
+    virtual void       ResetRawClusters();

     // Cluster Finding
     virtual void   Digits2Reco();
     virtual void   FindClusters();
     // Cluster Finding
     virtual void   Digits2Reco();
     virtual void   FindClusters();

diff --git a/MUON/AliMUONLoader.cxx b/MUON/AliMUONLoader.cxx
new file mode 100644 (file)
index 0000000..2e6ad04
--- /dev/null
+++ b/MUON/AliMUONLoader.cxx
@@ -0,0 +1,39 @@
+
+
+//Root includes
+
+//AliRoot includes
+#include "AliMUONLoader.h"
+
+ClassImp(AliMUONLoader)
+//___________________________________________________________________
+
+ 
+/*****************************************************************************/ 
+AliMUONLoader::AliMUONLoader():AliLoader()
+{
+//default constructor
+
+}
+/******************************************************************/
+
+AliMUONLoader::AliMUONLoader(const Char_t* detname,const Char_t* eventfoldername):AliLoader(detname,eventfoldername)
+{
+    
+}
+/*****************************************************************************/ 
+
+AliMUONLoader::AliMUONLoader(const Char_t * detname,TFolder* eventfolder):AliLoader(detname,eventfolder)
+{
+//constructor
+  
+}
+/*****************************************************************************/ 
+
+AliMUONLoader::~AliMUONLoader()
+{
+//detructor
+ 
+}
+/*****************************************************************************/ 
+

diff --git a/MUON/AliMUONLoader.h b/MUON/AliMUONLoader.h
new file mode 100644 (file)
index 0000000..245f633
--- /dev/null
+++ b/MUON/AliMUONLoader.h
@@ -0,0 +1,38 @@
+#ifndef ALIMUONLOADER_H
+#define ALIMUONLOADER_H
+
+#include "AliLoader.h"
+#include "AliDataLoader.h"
+
+//__________________________________________________________________
+/////////////////////////////////////////////////////////////////////
+//                                                                 //
+//  class AliMUONLoader                                            //
+//                                                                 //
+/////////////////////////////////////////////////////////////////////
+
+class AliMUONLoader : public AliLoader {
+ public:
+    AliMUONLoader();
+    AliMUONLoader(const Char_t *detname,const Char_t *eventfoldername); //contructor with name of the top folder of the tree
+    AliMUONLoader(const Char_t *detname,TFolder* eventfolder);
+
+    virtual ~AliMUONLoader();
+   
+ private:
+    //descendant classes should
+    //use protected interface methods to access these folders
+
+    /**********************************************/
+    /***********     P U B L I C     **************/
+    /*********       S T A T I C       ************/
+    /*********         METHODS         ************/
+    /*********     They are used by    ************/
+    /*********** AliRunLoader as well**************/
+    /**********************************************/
+ public:
+ 
+    ClassDef(AliMUONLoader,1)
+ };
+
+#endif

diff --git a/MUON/MUONLinkDef.h b/MUON/MUONLinkDef.h
index 6ba0618a6bb0842e35d7c30c4f8bcf6043681ae3..380b7a438c4cae8d83f2606d6c5a0be55beac635 100644 (file)
--- a/MUON/MUONLinkDef.h
+++ b/MUON/MUONLinkDef.h
@@ -5,7 +5,7 @@
 #pragma link C++ class  AliMUON+;
 #pragma link C++ class  AliMUONv0+;
 #pragma link C++ class  AliMUONv1+;
 #pragma link C++ class  AliMUON+;
 #pragma link C++ class  AliMUONv0+;
 #pragma link C++ class  AliMUONv1+;

-#pragma link C++ class  AliMUONv3+;
+#pragma link C++ class  AliMUONLoader+;

 #pragma link C++ class  AliMUONHit+;
 #pragma link C++ class  AliMUONPadHit+;
 #pragma link C++ class  AliMUONDigit+;
 #pragma link C++ class  AliMUONHit+;
 #pragma link C++ class  AliMUONPadHit+;
 #pragma link C++ class  AliMUONDigit+;

diff --git a/MUON/libMUON.pkg b/MUON/libMUON.pkg
index 452ce97342aa06fc067a3b3c9de48309e7e48bc8..47e994237991a0eb0fb7dab5e8c36c919b3a6001 100644 (file)
--- a/MUON/libMUON.pkg
+++ b/MUON/libMUON.pkg
@@ -9,7 +9,7 @@ SRCS         = AliMUONChamber.cxx AliMUONChamberTrigger.cxx \
               AliMUONSegmentationTrigger.cxx  AliMUONResponseTrigger.cxx\
                AliMUONResponseTriggerV1.cxx\
               AliMUONSegmentationTriggerX.cxx AliMUONSegmentationTriggerY.cxx \
               AliMUONSegmentationTrigger.cxx  AliMUONResponseTrigger.cxx\
                AliMUONResponseTriggerV1.cxx\
               AliMUONSegmentationTriggerX.cxx AliMUONSegmentationTriggerY.cxx \

-               AliMUONSegmentationV1.cxx AliMUON.cxx AliMUONv0.cxx AliMUONv1.cxx AliMUONv3.cxx \
+               AliMUONSegmentationV1.cxx AliMUON.cxx AliMUONv0.cxx AliMUONv1.cxx \

                AliMUONDisplay.cxx AliMUONPoints.cxx \
                AliMUONClusterFinderVS.cxx \
                AliMUONHitMapA1.cxx \
                AliMUONDisplay.cxx AliMUONPoints.cxx \
                AliMUONClusterFinderVS.cxx \
                AliMUONHitMapA1.cxx \


@@ -28,7 +28,8 @@ SRCS         = AliMUONChamber.cxx AliMUONChamberTrigger.cxx \
               AliMUONSegmentationSlat.cxx AliMUONSegmentationSlatN.cxx \
               AliMUONRecoEvent.cxx AliMUONRecoDisplay.cxx \
                AliMUONMerger.cxx AliMUONFactory.cxx AliMUONDigitizer.cxx AliMUONDigitizerv1.cxx \
               AliMUONSegmentationSlat.cxx AliMUONSegmentationSlatN.cxx \
               AliMUONRecoEvent.cxx AliMUONRecoDisplay.cxx \
                AliMUONMerger.cxx AliMUONFactory.cxx AliMUONDigitizer.cxx AliMUONDigitizerv1.cxx \

-               AliMUONTrackK.cxx AliMUONClusterFinderAZ.cxx AliMUONPixel.cxx
+               AliMUONTrackK.cxx AliMUONClusterFinderAZ.cxx AliMUONPixel.cxx \
+               AliMUONLoader.cxx

 
 SRCS     += AliMUONv2.cxx AliMUONSt1Segmentation.cxx AliMUONSt1Response.cxx \
            AliMUONSt1ElectronicElement.cxx AliMUONSt1SpecialMotif.cxx \
 
 SRCS     += AliMUONv2.cxx AliMUONSt1Segmentation.cxx AliMUONSt1Response.cxx \
            AliMUONSt1ElectronicElement.cxx AliMUONSt1SpecialMotif.cxx \