X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUON.cxx;h=05e617613abe086918bc00d6a71273a0d4a695ad;hb=00b6d74faeeee6ae0f786a3d5e624319c73e6ebd;hp=651467db6b27630f8c89c5ea57ce93811f581ce2;hpb=e516b01dc9b050949d85a6e082e9213ee783c82c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUON.cxx b/MUON/AliMUON.cxx
index 651467db6b2..05e617613ab 100644
--- a/MUON/AliMUON.cxx
+++ b/MUON/AliMUON.cxx
@@ -60,10 +60,13 @@
 #include "AliMUONTransientDigit.h"
 #include "AliMUONTriggerCircuit.h"
 #include "AliMUONGeometryBuilder.h"
+#include "AliMUONCommonGeometryBuilder.h"
 #include "AliMUONVGeometryBuilder.h"	
+#include "AliMUONGeometryDEIndexing.h"	
 #include "AliMUONDigitizerv2.h"
 #include "AliMUONSDigitizerv1.h"
 #include "AliMUONRawData.h"
+#include "AliLog.h"
 
 // Defaults parameters for Z positions of chambers
 // taken from values for "stations" in AliMUON::AliMUON
@@ -91,6 +94,7 @@ AliMUON::AliMUON()
     fChambers(0),
     fTriggerCircuits(0),
     fGeometryBuilder(0),
+    fDEIndexing(0),
     fAccCut(kFALSE),
     fAccMin(0.),
     fAccMax(0.),   
@@ -117,6 +121,7 @@ AliMUON::AliMUON(const char *name, const char *title)
     fChambers(0),
     fTriggerCircuits(0),
     fGeometryBuilder(0),
+    fDEIndexing(0),
     fAccCut(kFALSE),
     fAccMin(0.),
     fAccMax(0.),   
@@ -132,6 +137,25 @@ AliMUON::AliMUON(const char *name, const char *title)
   fIshunt =  0;
 
   SetMarkerColor(kRed);//
+    
+  // Geometry builder
+  fGeometryBuilder = new AliMUONGeometryBuilder(this);
+  
+  // Common geometry definitions
+  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;
@@ -168,9 +192,6 @@ AliMUON::AliMUON(const char *name, const char *title)
     for (Int_t circ=0; circ<AliMUONConstants::NTriggerCircuit(); circ++) {
       fTriggerCircuits->AddAt(new AliMUONTriggerCircuit(),circ);          
     }
-    
-    // Geometry builder
-    fGeometryBuilder = new AliMUONGeometryBuilder(this);
 }
 
 //____________________________________________________________________
@@ -179,14 +200,14 @@ AliMUON::AliMUON(const AliMUON& rMUON)
 {
 // Protected copy constructor
 
-  Fatal("AliMUONMergerModule", "Not implemented.");
+  AliFatal("Not implemented.");
 }
 
 //____________________________________________________________________
 AliMUON::~AliMUON()
 {
 // Destructor
-  if(fDebug) printf("%s: Calling AliMUON destructor !!!\n",ClassName());
+  AliDebug(1,"Calling AliMUON destructor");
   fIshunt  = 0;
   if (fMerger) delete fMerger;
 
@@ -200,6 +221,7 @@ AliMUON::~AliMUON()
   }
   delete fMUONData;
   delete fGeometryBuilder;
+  delete fDEIndexing;
 }
 
 //________________________________________________________________________
@@ -209,7 +231,7 @@ AliMUON& AliMUON::operator = (const AliMUON& rhs)
 
   if (this == &rhs) return *this;
 
-  Fatal("operator=", "Not implemented.");
+  AliFatal("Not implemented.");
     
   return *this;  
 }
@@ -431,11 +453,9 @@ void AliMUON::SDigits2Digits()
 // write TreeD here 
 
     if (!fMerger) {
-      if (gAlice->GetDebug()>0) {
-	cerr<<"AliMUON::SDigits2Digits: create default AliMUONMerger "<<endl;
-	cerr<<" no merging, just digitization of 1 event will be done"<<endl;
-      }
-      fMerger = new AliMUONMerger();
+		AliDebug(1,"Create default AliMUONMerger ");
+		AliDebug(1," no merging, just digitization of 1 event will be done");
+     	fMerger = new AliMUONMerger();
     }
     fMerger->Init();
     fMerger->Digitise();
@@ -467,7 +487,7 @@ void AliMUON::Digits2Raw()
   AliMUONRawData* rawData;
 
   rawData = new AliMUONRawData(fLoader);
-  if (!rawData->WriteRawData()) Info("MUON","pb writting raw data");
+  if (!rawData->WriteRawData()) AliInfo("pb writting raw data");
   delete rawData;
   return;
 }
@@ -477,10 +497,9 @@ 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);
+ 
+ AliDebug(1,Form("Creating standard getter for detector %s. Top folder is %s.",
+         GetName(),topfoldername));
  fLoader   = new AliLoader(GetName(),topfoldername);
  fMUONData = new AliMUONData(fLoader,GetName(),GetName()); 
  fMUONData->SetSplitLevel(fSplitLevel);