Separating writing and reading of raw data (Christian)

[u/mrichter/AliRoot.git] / MUON / AliMUON.cxx

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 4587d071c1abc525c066fde18024ac74f54e8e76..48ba3496431c25656a738657d626b7f324fe9e18 100644 (file)
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -57,15 +57,16 @@
 #include "AliMUONRawCluster.h"
 #include "AliMUONTransientDigit.h"
 #include "AliMUONTriggerCircuit.h"
+#include "AliMUONGeometry.h"
+#include "AliMUONGeometryTransformer.h"
 #include "AliMUONGeometryBuilder.h"
 #include "AliMUONCommonGeometryBuilder.h"
 #include "AliMUONVGeometryBuilder.h"   
-#include "AliMUONGeometryDEIndexing.h" 
 #include "AliMUONGeometrySegmentation.h"
 #include "AliMUONDigitizerv2.h"
 #include "AliMUONSDigitizerv1.h"
-#include "AliMUONRawData.h"
-#include "AliMUONFactoryV2.h"
+#include "AliMUONRawWriter.h"
+#include "AliMUONSegmentation.h"
 #include "AliLog.h"
 
 // Defaults parameters for Z positions of chambers
@@ -94,8 +95,7 @@ AliMUON::AliMUON()
     fChambers(0),
     fTriggerCircuits(0),
     fGeometryBuilder(0),
-    fSegmentationType(2),// set to 2 default wise new seg
-    fDEIndexing(0),
+    fSegmentation(0),
     fAccCut(kFALSE),
     fAccMin(0.),
     fAccMax(0.),   
@@ -104,11 +104,11 @@ AliMUON::AliMUON()
     fMaxDestepGas(0.),
     fMaxDestepAlu(0.),
     fMaxIterPad(0),
-    fCurIterPad(0),
-    fFactory(0)
+    fCurIterPad(0)
 {
 // Default Constructor
 //
+       AliDebug(1,Form("default (empty) ctor this=%p",this));
     fIshunt          = 0;
 }
 
@@ -122,8 +122,7 @@ AliMUON::AliMUON(const char *name, const char *title)
     fChambers(0),
     fTriggerCircuits(0),
     fGeometryBuilder(0),
-    fSegmentationType(2),// set to 2 default wise new seg
-    fDEIndexing(0),
+    fSegmentation(0),
     fAccCut(kFALSE),
     fAccMin(0.),
     fAccMax(0.),   
@@ -132,10 +131,9 @@ AliMUON::AliMUON(const char *name, const char *title)
     fMaxDestepGas(-1), // Negatives values are ignored by geant3 CONS200 
     fMaxDestepAlu(-1), // in the calculation of the tracking parameters
     fMaxIterPad(0),
-    fCurIterPad(0),
-    fFactory(0)
+    fCurIterPad(0)
 {
-
+       AliDebug(1,Form("ctor this=%p",this));
   fIshunt =  0;
 
   SetMarkerColor(kRed);//
@@ -147,17 +145,6 @@ AliMUON::AliMUON(const char *name, const char *title)
   fGeometryBuilder
     ->AddBuilder(new AliMUONCommonGeometryBuilder(this));
 
-  // Define the global transformation:
-  // Transformation from the old ALICE coordinate system to a new one:
-  // x->-x, z->-z 
-  TGeoRotation* rotGlobal 
-    = new TGeoRotation("rotGlobal", 90., 180., 90., 90., 180., 0.);
-  fGeometryBuilder
-    ->SetGlobalTransformation (TGeoCombiTrans(0., 0., 0., rotGlobal));
-
-  // Detection elements indexing
-  fDEIndexing = new AliMUONGeometryDEIndexing();
-
 //
 // Creating List of Chambers
     Int_t ch;
@@ -174,18 +161,8 @@ AliMUON::AliMUON(const char *name, const char *title)
        if (ch < AliMUONConstants::NTrackingCh()) {
          fChambers->AddAt(new AliMUONChamber(ch),ch);
        } else {
-         fChambers->AddAt(new AliMUONChamberTrigger(ch),ch);
+         fChambers->AddAt(new AliMUONChamberTrigger(ch, GetGeometryTransformer()),ch);
        }
-       AliMUONChamber* chamber = (AliMUONChamber*) fChambers->At(ch);
-       //chamber->SetGid(0);
-       // Default values for Z of chambers
-       chamber->SetZ(AliMUONConstants::DefaultChamberZ(ch));
-       //
-       chamber->InitGeo(AliMUONConstants::DefaultChamberZ(ch));
-       //          Set chamber inner and outer radius to default
-       chamber->SetRInner(AliMUONConstants::Dmin(st)/2.);
-       chamber->SetROuter(AliMUONConstants::Dmax(st)/2.);
-       //
       } // Chamber stCH (0, 1) in 
     }     // Station st (0...)
     
@@ -209,7 +186,7 @@ AliMUON::AliMUON(const AliMUON& rMUON)
 AliMUON::~AliMUON()
 {
 // Destructor
-  AliDebug(1,"Calling AliMUON destructor");
+  AliDebug(1,Form("dtor this=%p",this));
   fIshunt  = 0;
 
   if (fChambers){
@@ -222,8 +199,7 @@ AliMUON::~AliMUON()
   }
   delete fMUONData;
   delete fGeometryBuilder;
-  delete fDEIndexing;
-  delete fFactory; 
+  delete fSegmentation;
 }
 
 //________________________________________________________________________
@@ -252,11 +228,6 @@ void AliMUON::BuildGeometry()
 {
 // Geometry for event display
 
-  if (!fSegmentationType) {
-    AliFatal("No Segmentation Type defined.");
-    return;
-  }
-
 
 //     for (Int_t i = 0; i < AliMUONConstants::NCh(); i++)     
 //       this->Chamber(i).SegmentationModel2(1)->Draw("eventdisplay");// to be check !
@@ -264,6 +235,31 @@ void AliMUON::BuildGeometry()
   
 }
 
+//____________________________________________________________________
+const AliMUONGeometry*  AliMUON::GetGeometry() const
+{
+// Return geometry parametrisation
+
+  if ( !fGeometryBuilder) {
+    AliWarningStream() << "GeometryBuilder not defined." << std::endl;
+    return 0;
+  }
+  
+  return fGeometryBuilder->GetGeometry();
+}   
+
+//____________________________________________________________________
+const AliMUONGeometryTransformer*  AliMUON::GetGeometryTransformer() const
+{
+// Return geometry parametrisation
+
+  const AliMUONGeometry* kGeometry = GetGeometry();
+  
+  if ( !kGeometry) return 0;
+
+  return kGeometry->GetTransformer();
+}   
+
 //__________________________________________________________________
 void  AliMUON::SetTreeAddress()
 {
@@ -281,23 +277,6 @@ void  AliMUON::SetTreeAddress()
   fHits = GetMUONData()->Hits(); // Added by Ivana to use the methods FisrtHit, NextHit of AliDetector    
 }
 
-//___________________________________________
-void AliMUON::SetChambersZ(const Float_t *Z)
-{
-  // Set Z values for all chambers (tracking and trigger)
-  // from the array pointed to by "Z"
-    for (Int_t ch = 0; ch < AliMUONConstants::NCh(); ch++)
-       ((AliMUONChamber*) fChambers->At(ch))->SetZ(Z[ch]);
-    return;
-}
-//_________________________________________________________________
-void AliMUON::SetChambersZToDefault()
-{
-  // Set Z values for all chambers (tracking and trigger)
-  // to default values
-  SetChambersZ(AliMUONConstants::DefaultChamberZ());
-  return;
-}
 //_________________________________________________________________
 void AliMUON::SetChargeSlope(Int_t id, Float_t p1)
 {
@@ -397,14 +376,15 @@ Float_t  AliMUON::GetMaxDestepAlu() const
  
    fGeometryBuilder->SetAlign(align);
 }   
-    
+
 //____________________________________________________________________
-void   AliMUON::SetSegmentationModel(Int_t id, Int_t isec, AliMUONGeometrySegmentation*  segmentation)
+ void  AliMUON::SetAlign(const TString& fileName, Bool_t align)
 {
-// Set the segmentation for chamber id cathode isec
-    ((AliMUONChamber*) fChambers->At(id))->SetSegmentationModel(isec, segmentation);
+ // Sets option for alignement to geometry builder
+ 
+   fGeometryBuilder->SetAlign(fileName, align);
+}   
 
-}
 //____________________________________________________________________
 void   AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response)
 {
@@ -412,12 +392,6 @@ void   AliMUON::SetResponseModel(Int_t id, AliMUONResponse *response)
     ((AliMUONChamber*) fChambers->At(id))->SetResponseModel(response);
 }
 //____________________________________________________________________
-void   AliMUON::SetNsec(Int_t id, Int_t nsec)
-{
-// Set number of segmented cathods for chamber id
-    ((AliMUONChamber*) fChambers->At(id))->SetNsec(nsec);
-}
-//____________________________________________________________________
 AliDigitizer* AliMUON::CreateDigitizer(AliRunDigitizer* manager) const
 {
   return new AliMUONDigitizerv2(manager);
@@ -453,10 +427,10 @@ void AliMUON::Hits2SDigits()
 void AliMUON::Digits2Raw()
 {
   // convert digits of the current event to raw data
-  AliMUONRawData* rawData;
+  AliMUONRawWriter* rawData;
 
-  rawData = new AliMUONRawData(fLoader);
-  if (!rawData->WriteRawData()) AliInfo("pb writting raw data");
+  rawData = new AliMUONRawWriter(fLoader,fMUONData);
+  if (!rawData->Digits2Raw()) AliInfo("pb writting raw data");
   delete rawData;
   return;
 }