Added to new container structures AliHLTPHOSRcuCellEnergyData.h and AliHLTPHOSModuleC...

[u/mrichter/AliRoot.git] / FMD / AliFMD.cxx

diff --git a/FMD/AliFMD.cxx b/FMD/AliFMD.cxx
index 2d699decb1660e66ac71b0ffddeada451ad46ee3..9be365dde77b8975cefeb6987ccdb802e30fbe2d 100644 (file)
--- a/FMD/AliFMD.cxx
+++ b/FMD/AliFMD.cxx
@@ -84,7 +84,7 @@
 // These files are not in the same directory, so there's no reason to
 // ask the preprocessor to search in the current directory for these
 // files by including them with `#include "..."' 
-// #include <math.h>               // __CMATH__
+#include <cmath>                // __CMATH__
 #include <TClonesArray.h>      // ROOT_TClonesArray
 #include <TGeometry.h>         // ROOT_TGeomtry
 #include <TNode.h>             // ROOT_TNode
@@ -142,19 +142,6 @@ AliFMD::AliFMD()
   fBad         = new TClonesArray("AliFMDHit");
 }
 
-//____________________________________________________________________
-AliFMD::AliFMD(const AliFMD& other)
-  : AliDetector(other),
-    fSDigits(other.fSDigits), 
-    fNsdigits(other.fNsdigits),
-    fDetailed(other.fDetailed),
-    fUseOld(other.fUseOld),
-    fUseAssembly(other.fUseAssembly),
-    fBad(other.fBad)
-{
-  // Copy constructor 
-}
-
 //____________________________________________________________________
 AliFMD::AliFMD(const char *name, const char *title)
   : AliDetector (name, title),
@@ -181,8 +168,8 @@ AliFMD::AliFMD(const char *name, const char *title)
   
   // CHC: What is this?
   fIshunt = 0;
-  SetMarkerColor(kRed);
-  SetLineColor(kYellow);
+  //PH  SetMarkerColor(kRed);
+  //PH  SetLineColor(kYellow);
 }
 
 //____________________________________________________________________
@@ -211,18 +198,6 @@ AliFMD::~AliFMD ()
   }
 }
 
-//____________________________________________________________________
-AliFMD&
-AliFMD::operator=(const AliFMD& other)
-{
-  // Assignment operator
-  AliDetector::operator=(other);
-  fSDigits             = other.fSDigits; 
-  fNsdigits            = other.fNsdigits;
-  fDetailed            = other.fDetailed;
-  fBad                  = other.fBad;
-  return *this;
-}
 
 //====================================================================
 //
@@ -510,7 +485,7 @@ AliFMD::BuildGeometry()
       }
       shape->DefineSection(0, -siThick / 2, 1, 0, 0);
       shape->DefineSection(1, +siThick / 2, 1, 0, 0);
-      shape->SetLineColor(GetLineColor());
+      shape->SetLineColor(kYellow); //PH kYellow is the default line color in FMD
       
       TObjArray* rots = new TObjArray(nmod);
       for (Int_t j = 0; j < nmod; j++) {
@@ -585,7 +560,7 @@ AliFMD::BuildGeometry()
        TNode* mnod = new TNode(name.Data(), title.Data(), rshape, 
                                0, 0, rz - siThick / 2 
                                + TMath::Sign(offz,z), rot);
-       mnod->SetLineColor(GetLineColor());
+       mnod->SetLineColor(kYellow); //PH kYellow is the default line color in FMD
        fNodes->Add(mnod);
       } // for (Int_t k = 0 ; ...)
     } // for (Int_t j = 0 ; ...)
@@ -635,7 +610,7 @@ AliFMD::LoadPoints(Int_t /* track */)
     // than 1 keV - a MIP is 100 eV. 
     if (edep > absQ * absQ && poverm > 1) bad = kTRUE;
 
-    AliFMDPoints* p1 = new AliFMDPoints(hit, GetMarkerColor());
+    AliFMDPoints* p1 = new AliFMDPoints(hit, kRed); //PH kRed is the default marker color in FMD
     // AliPoints* p1 = new AliPoints();
     // p1->SetMarkerColor(GetMarkerColor());
     // p1->SetMarkerSize(GetMarkerSize());
@@ -1111,12 +1086,14 @@ AliFMD::AddAlignableVolumes() const
   // This code was made by Raffaele Grosso <rgrosso@mail.cern.ch>.  I
   // (cholm) will probably want to change it.   For one, I think it
   // should be the job of the geometry manager to deal with this. 
+  AliFMDGeometry::Instance()->SetAlignableVolumes();
+#if 0  
   for(size_t f = 1; f <= 3; f++){ // Detector 1,2,3
     for(size_t tb =  0; tb <2 ; tb++){ // Top/Bottom 
       char     stb = tb == 0 ? 'T' : 'B';
       unsigned min = tb == 0 ? 0   : 5;
 
-      TString halfVol(Form("/ALIC/F%dM%c_%d", f, stb, f));
+      TString halfVol(Form("/ALIC_1/F%dM%c_%d", f, stb, f));
       TString halfSym(halfVol);
       if(!gGeoManager->SetAlignableEntry(halfSym.Data(),halfVol.Data()))
        AliFatal(Form("Alignable entry %s not created. "
@@ -1124,8 +1101,8 @@ AliFMD::AddAlignableVolumes() const
                      halfSym.Data(),halfVol.Data()));
       for(size_t io = 0; io < 2; io++){ // inner, outer 
        if (f==1 && io==1) continue; // Only one ring in FMD1 
-       min          = (tb == 1 ? 10 : min);
-       char     sio = (io == 0 ? 'I' : '0');
+       if(tb == 1 && io==1) min=10;
+       char     sio = (io == 0 ? 'I' : 'O');
        unsigned nio = (io == 0 ? 3   : 9);
        unsigned max = (io == 0 ? 5   : 10) + min;
        
@@ -1141,7 +1118,7 @@ AliFMD::AddAlignableVolumes() const
       }
     }
   }
-
+#endif
 }
 //___________________________________________________________________
 //