Implemented Raw2SDigits method for tracker (Christian)

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 22a13c023755286a80616819ed3041a6d95798c5..9e862ad6fa79e47930cc25409f426f03f953cd15 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -73,6 +73,7 @@
 
 #include "AliMUONSDigitizerV2.h"
 #include "AliMUONDigitizerV3.h"
+#include "AliMUONDigitMaker.h"
 
 #include "AliMUONSt1GeometryBuilderV2.h"
 #include "AliMUONSt2GeometryBuilderV2.h"
@@ -123,7 +124,9 @@ AliMUON::AliMUON()
     fTriggerCoinc44(0),
     fSDigitizerType(""),
     fDigitizerType(""),
-  fRawWriter(0x0)
+    fRawWriter(0x0),
+    fDigitMaker(0x0)
+
 {
 /// Default Constructor
     
@@ -159,7 +162,8 @@ AliMUON::AliMUON(const char *name, const char *title,
     fTriggerCoinc44(0),
     fSDigitizerType(sDigitizerClassName),
     fDigitizerType(digitizerClassName),
-  fRawWriter(0x0)
+    fRawWriter(0x0),
+    fDigitMaker(new AliMUONDigitMaker(kFALSE)) 
 {
 /// Standard constructor  
   
@@ -215,7 +219,6 @@ AliMUON::AliMUON(const char *name, const char *title,
     for (Int_t circ=0; circ<AliMUONConstants::NTriggerCircuit(); circ++) {
       fTriggerCircuitsNew->AddAt(new AliMUONTriggerCircuitNew(),circ);          
     }
-    
 }
 
 //____________________________________________________________________
@@ -243,6 +246,7 @@ AliMUON::~AliMUON()
   delete fGeometryBuilder;
   delete fSegmentation;
   delete fRawWriter;
+  delete fDigitMaker;
 }
 
 //_____________________________________________________________________________
@@ -548,6 +552,28 @@ void AliMUON::Digits2Raw()
   }
 }
 
+//_____________________________________________________________________
+Bool_t AliMUON::Raw2SDigits(AliRawReader* rawReader)
+{
+/// Convert  raw data to SDigit
+/// Only for tracking for the moment (ChF) 
+
+  //fLoader->LoadDigits("READ");
+  if (!fLoader->TreeS()) fLoader->MakeSDigitsContainer();
+
+  fMUONData->MakeBranch("S");
+  fMUONData->SetTreeAddress("S");
+  fDigitMaker->Raw2Digits(rawReader);
+  fMUONData->Fill("S");
+
+  fLoader->WriteSDigits("OVERWRITE");
+  fMUONData->ResetSDigits();
+  fLoader->UnloadSDigits();
+
+  return kTRUE;
+
+}
+
 //_______________________________________________________________________
 AliLoader* AliMUON::MakeLoader(const char* topfoldername)
 { 
@@ -559,6 +585,9 @@ AliLoader* AliMUON::MakeLoader(const char* topfoldername)
  fLoader   = new AliLoader(GetName(),topfoldername);
  fMUONData = new AliMUONData(fLoader,GetName(),GetName()); 
  fMUONData->SetSplitLevel(fSplitLevel);
+
+ fDigitMaker->SetMUONData(fMUONData);
+
  return fLoader;
 }
 //_______________________________________________________________________

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index bef888f15125ea30804cc382f109ec6ecdfddb09..33a3af721eb7835b99e1b945097747f19625b259 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -38,6 +38,7 @@ class AliMUONGeometryBuilder;
 class AliMUONRawWriter;
 class AliMUONVGeometryBuilder;
 class AliESD;
+class AliMUONDigitMaker;
 
 class AliMUON : public  AliDetector 
 {
@@ -86,7 +87,8 @@ class AliMUON : public  AliDetector
     virtual void   SDigits2Digits();      
     virtual void   Hits2SDigits();
     virtual void   Digits2Raw();
-    
+    virtual Bool_t Raw2SDigits(AliRawReader* rawReader);
+
     // Trigger
                    /// Create trigger
     virtual AliTriggerDetector* CreateTriggerDetector() const
@@ -192,6 +194,8 @@ class AliMUON : public  AliDetector
     
     AliMUONRawWriter* fRawWriter; //!< Raw data writer
     
+    AliMUONDigitMaker* fDigitMaker; //!< pointer to the digit maker class
+
     ClassDef(AliMUON,13)  // MUON Detector base class
 };
 #endif

diff --git a/MUON/AliMUONDigitMaker.cxx b/MUON/AliMUONDigitMaker.cxx
index 235b83bed3bb3339543aa99a19b98472e0008de1..1b1f6e2d715eaa0d2f645717d6d7227c673a4439 100644 (file)
--- a/MUON/AliMUONDigitMaker.cxx
+++ b/MUON/AliMUONDigitMaker.cxx
@@ -77,12 +77,13 @@
 
 ClassImp(AliMUONDigitMaker) // Class implementation in ROOT context
 //__________________________________________________________________________
-AliMUONDigitMaker::AliMUONDigitMaker()
+AliMUONDigitMaker::AliMUONDigitMaker(Bool_t flag)
   : TObject(),
     fMUONData(0x0),
     fSegFactory(new AliMpSegFactory()),
     fBusPatchManager(new AliMpBusPatch()),
     fScalerEvent(kFALSE),
+    fDigitFlag(flag),
     fRawStreamTracker(new AliMUONRawStreamTracker()),    
     fRawStreamTrigger(new AliMUONRawStreamTrigger()),    
     fDigit(new AliMUONDigit()),
@@ -156,7 +157,8 @@ Int_t AliMUONDigitMaker::Raw2Digits(AliRawReader* rawReader)
   ReadTrackerDDL(rawReader);
 
   // generate trigger
-  ReadTriggerDDL(rawReader);
+  if (fDigitFlag)
+    ReadTriggerDDL(rawReader);
 
   return kTRUE;
 
@@ -247,7 +249,12 @@ Int_t AliMUONDigitMaker::ReadTrackerDDL(AliRawReader* rawReader)
 
            // fill digits
            iChamber = fDigit->DetElemId()/100 - 1;
-           fMUONData->AddDigit(iChamber, *fDigit);
+
+           if (fDigitFlag)
+             fMUONData->AddDigit(iChamber, *fDigit);
+           else
+             fMUONData->AddSDigit(iChamber, *fDigit);
+
 
          } // iData
        } // iBusPatch

diff --git a/MUON/AliMUONDigitMaker.h b/MUON/AliMUONDigitMaker.h
index 6414d4a043dbc81c501bcfdae12f335ad3e858e0..35cb8c7bf4287e2ffe3ed3d8b2ecec5ff4e8e997 100644 (file)
--- a/MUON/AliMUONDigitMaker.h
+++ b/MUON/AliMUONDigitMaker.h
@@ -5,7 +5,7 @@
 
 /*$Id$*/
 
-/// \ingroup rec
+/// \ingroup base
 /// \class AliMUONDigitMaker
 /// \brief Raw data class for trigger and tracker chambers
 ///
@@ -28,7 +28,7 @@ class AliMUONRawStreamTrigger;
 class AliMUONDigitMaker : public TObject 
 {
  public:
-  AliMUONDigitMaker(); // Constructor
+  AliMUONDigitMaker(Bool_t digit = kTRUE); // Constructor
   virtual ~AliMUONDigitMaker(void); // Destructor
     
   // write raw data
@@ -55,6 +55,8 @@ class AliMUONDigitMaker : public TObject
 
   Bool_t           fScalerEvent;       //!< flag to generates scaler event
 
+  Bool_t           fDigitFlag;        //!< true for Digit, false for SDigit
+
   AliMUONRawStreamTracker* fRawStreamTracker;  //!< pointer of raw stream for tracker
   AliMUONRawStreamTrigger* fRawStreamTrigger;  //!< pointer of raw stream for trigger
 

diff --git a/MUON/AliMUONRawStreamTracker.h b/MUON/AliMUONRawStreamTracker.h
index 0554f09ae88c633c42b8df5c203d0970f0444dd8..a5d1a1d1741539ad8d710b95e6ee414e6ec34f9b 100644 (file)
--- a/MUON/AliMUONRawStreamTracker.h
+++ b/MUON/AliMUONRawStreamTracker.h
@@ -5,7 +5,7 @@
 
 /*$Id$*/
 
-/// \ingroup raw
+/// \ingroup base
 /// \class AliMUONRawStreamTracker
 /// \brief Class for reading MUON raw digits
 ///

diff --git a/MUON/AliMUONRawStreamTrigger.h b/MUON/AliMUONRawStreamTrigger.h
index 21cf53ff851f737cf8d655ea299a652ea7288736..7f2792015aa45653f752513a12a1ad38b1a76c00 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.h
+++ b/MUON/AliMUONRawStreamTrigger.h
@@ -5,7 +5,7 @@
 
 /*$Id$*/
 
-/// \ingroup raw
+/// \ingroup base
 /// \class AliMUONRawStreamTrigger
 /// \brief Class for reading MUON raw digits
 ///

diff --git a/MUON/MUONbaseLinkDef.h b/MUON/MUONbaseLinkDef.h
index 39a81a8576a0e5eb34f14e1981a0c3a4f022d6cc..d57c8a859457cdbc757e44019da22af6f0499135 100644 (file)
--- a/MUON/MUONbaseLinkDef.h
+++ b/MUON/MUONbaseLinkDef.h
@@ -55,6 +55,11 @@
 #pragma link C++ class AliMUONCalibrationData+;
 #pragma link C++ class AliMUONTriggerEfficiencyCells+;
 
+// raw data
+#pragma link C++ class AliMUONDigitMaker+;
+#pragma link C++ class AliMUONRawStreamTracker+;
+#pragma link C++ class AliMUONRawStreamTrigger+;
+
 // debug
 #pragma link C++ class AliMUONCheck+;
 

diff --git a/MUON/MUONrecLinkDef.h b/MUON/MUONrecLinkDef.h
index 5f78f59eaa78907a3dd9df6730054100376f4b0c..5954aa8c6dfba5ad96642420210a79903df3951a 100644 (file)
--- a/MUON/MUONrecLinkDef.h
+++ b/MUON/MUONrecLinkDef.h
@@ -29,11 +29,6 @@
 // calibration
 #pragma link C++ class AliMUONDigitCalibrator+;
 
-// raw data
-#pragma link C++ class AliMUONDigitMaker+;
-#pragma link C++ class AliMUONRawStreamTracker+;
-#pragma link C++ class AliMUONRawStreamTrigger+;
-
 // display
 #pragma link C++ class AliMUONDisplay+; 
 #pragma link C++ class AliMUONRecoCheck+;

diff --git a/MUON/libMUONbase.pkg b/MUON/libMUONbase.pkg
index 22e04713fc137196c18307f116e99495a5dc5eb0..58c7ae9bbf0d3ba9e0bcf7133e91f2a07654886f 100644 (file)
--- a/MUON/libMUONbase.pkg
+++ b/MUON/libMUONbase.pkg
@@ -40,7 +40,10 @@ SRCS:=  AliMUON.cxx AliMUONv1.cxx \
         AliMUONCalibParam2F.cxx \
         AliMUONCalibrationData.cxx \
         AliMUONCheck.cxx \
-        AliMUONTriggerEfficiencyCells.cxx
+        AliMUONTriggerEfficiencyCells.cxx\
+        AliMUONRawStreamTrigger.cxx \
+        AliMUONRawStreamTracker.cxx  \
+        AliMUONDigitMaker.cxx 
      
 HDRS:= $(SRCS:.cxx=.h)
 

diff --git a/MUON/libMUONrec.pkg b/MUON/libMUONrec.pkg
index 53756ed2d43635284e67c72fc827fe4b81befbfa..8c3c96577388e6a9da3a0257416b2d3b52e67cac 100644 (file)
--- a/MUON/libMUONrec.pkg
+++ b/MUON/libMUONrec.pkg
@@ -20,9 +20,6 @@ SRCS:= AliMUONClusterReconstructor.cxx \
        AliMUONDetElement.cxx \
        AliMUONEventRecoCombi.cxx \
        AliMUONDigitCalibrator.cxx \
-       AliMUONRawStreamTrigger.cxx \
-       AliMUONRawStreamTracker.cxx  \
-       AliMUONDigitMaker.cxx \
        AliMillepede.cxx \
        AliMUONAlignment.cxx \
        AliMUONDisplay.cxx \