Start a list of OCDB objects we use

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

diff --git a/MUON/AliMUONClusterSplitterMLEM.cxx b/MUON/AliMUONClusterSplitterMLEM.cxx
index dfc92a7e102575e2adab1edf2e320e60e9b7843c..b2efc607a84c5b899182afacca0e539811b418b1 100644 (file)
--- a/MUON/AliMUONClusterSplitterMLEM.cxx
+++ b/MUON/AliMUONClusterSplitterMLEM.cxx
@@ -32,11 +32,12 @@
 #include "AliMUONCluster.h"
 #include "AliMUONPad.h"
 #include "AliMUONPad.h"
-#include "AliMpStationType.h"
 #include "AliMUONConstants.h"
 #include "AliMpDEManager.h"
 #include "AliMUONMathieson.h"
 
+#include "AliMpEncodePair.h"
+
 #include "AliLog.h"
 
 #include <TClonesArray.h>
@@ -44,7 +45,6 @@
 #include <TMath.h>
 #include <TMatrixD.h>
 #include <TObjArray.h>
-#include <TROOT.h>
 #include <TRandom.h>
 #include <Riostream.h>
 
@@ -57,9 +57,9 @@ const Double_t AliMUONClusterSplitterMLEM::fgkCouplMin = 1.e-2; // threshold on
 
 //_____________________________________________________________________________
 AliMUONClusterSplitterMLEM::AliMUONClusterSplitterMLEM(Int_t detElemId, 
-                                                       TObjArray* fPixArray) 
+                                                       TObjArray* pixArray) 
 : TObject(),
-fPixArray(fPixArray),
+fPixArray(pixArray),
 fMathieson(0x0),
 fDetElemId(detElemId),
 fNpar(0),
@@ -69,13 +69,13 @@ fDebug(0)
 {
   /// Constructor
   
-  AliMp::StationType stationType = AliMpDEManager::GetStationType(fDetElemId);
+  AliMq::Station12Type stationType = AliMpDEManager::GetStation12Type(fDetElemId);
   
   Float_t kx3 = AliMUONConstants::SqrtKx3();
   Float_t ky3 = AliMUONConstants::SqrtKy3();
   Float_t pitch = AliMUONConstants::Pitch();
   
-  if ( stationType == AliMp::kStation1 )
+  if ( stationType == AliMq::kStation1 )
   {
     kx3 = AliMUONConstants::SqrtKx3St1();
     ky3 = AliMUONConstants::SqrtKy3St1();
@@ -207,7 +207,7 @@ AliMUONClusterSplitterMLEM::Fcn1(const AliMUONCluster& cluster,
   {
     AliMUONPad* pad = cluster.Pad(j);
     //if ( pad->Status() !=1 || pad->IsSaturated() ) continue;
-    if ( pad->Status() != AliMUONClusterFinderMLEM::fgkUseForFit) continue;
+    if ( pad->Status() != AliMUONClusterFinderMLEM::GetUseForFitFlag()) continue;
     if (iflag == 0) {
       if ( pad->IsReal() ) npads++; // exclude virtual pads
       qTot += pad->Charge(); 
@@ -248,13 +248,12 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
                                 Int_t iSimple, Int_t nfit, 
                                 Int_t *clustFit, TObjArray **clusters, 
                                 Double_t *parOk,
-                                TObjArray& clusterList)
+                                TObjArray& clusterList, TH2 *mlem)
 {
   /// Steering function and fitting procedure for the fit of pad charge distribution
   
   //  AliDebug(2,Form("iSimple=%d nfit=%d",iSimple,nfit));
   
-  TH2D *mlem = (TH2D*) gROOT->FindObject("mlem");
   Double_t xmin = mlem->GetXaxis()->GetXmin() - mlem->GetXaxis()->GetBinWidth(1);
   Double_t xmax = mlem->GetXaxis()->GetXmax() + mlem->GetXaxis()->GetBinWidth(1);
   Double_t ymin = mlem->GetYaxis()->GetXmin() - mlem->GetYaxis()->GetBinWidth(1);
@@ -270,7 +269,7 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
     AliMUONPad* pad = cluster.Pad(i);
     if ( !pad->IsReal() ) ++nVirtual;
     //if ( pad->Status() !=1 || pad->IsSaturated() ) continue;
-    if ( pad->Status() != AliMUONClusterFinderMLEM::fgkUseForFit ) continue;
+    if ( pad->Status() != AliMUONClusterFinderMLEM::GetUseForFitFlag() ) continue;
     if ( pad->IsReal() )
     {
       ++npads;
@@ -334,18 +333,18 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
   
   // Get number of pads in X and Y 
   //const Int_t kStatusToTest(1);
-  const Int_t kStatusToTest(AliMUONClusterFinderMLEM::fgkUseForFit);
+  const Int_t kStatusToTest(AliMUONClusterFinderMLEM::GetUseForFitFlag());
   
-  AliMpIntPair nofPads = cluster.NofPads(kStatusToTest);
-  Int_t nInX = nofPads.GetFirst();
-  Int_t nInY = nofPads.GetSecond();
+  Long_t nofPads = cluster.NofPads(kStatusToTest);
+  Int_t nInX = AliMp::PairFirst(nofPads);
+  Int_t nInY = AliMp::PairSecond(nofPads);
 
   if (fDebug) {
     Int_t npadOK = 0;
     for (Int_t j = 0; j < cluster.Multiplicity(); ++j) {
       AliMUONPad *pad = cluster.Pad(j);
       //if (pad->Status() == 1 && !pad->IsSaturated()) npadOK++;
-      if (pad->Status() == AliMUONClusterFinderMLEM::fgkUseForFit && !pad->IsSaturated()) npadOK++;
+      if (pad->Status() == AliMUONClusterFinderMLEM::GetUseForFitFlag() && !pad->IsSaturated()) npadOK++;
     }
     cout << " Number of pads to fit: " << npadOK << endl;
     cout << " nInX and Y: " << nInX << " " << nInY << endl;
@@ -354,7 +353,7 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
   Int_t nfitMax = 3; 
   nfitMax = TMath::Min (nfitMax, (npads + 1) / 3);
   if (nfitMax > 1) {
-    if (nInX < 3 && nInY < 3 || nInX == 3 && nInY < 3 || nInX < 3 && nInY == 3) nfitMax = 1; // not enough pads in each direction
+    if (((nInX < 3) && (nInY < 3)) || ((nInX == 3) && (nInY < 3)) || ((nInX < 3) && (nInY == 3))) nfitMax = 1; // not enough pads in each direction
   }
   if (nfit > nfitMax) nfit = nfitMax;
   
@@ -513,8 +512,8 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
         {
          shift[j] = 0;
        }
-       else if (deriv[min][j]*deriv[!min][j] > 0 && TMath::Abs(deriv[min][j]) > TMath::Abs(deriv[!min][j])
-                || TMath::Abs(deriv[0][j]-deriv[1][j]) < 1.e-3 || TMath::Abs(dder[j]) < 1.e-6) 
+       else if (((deriv[min][j]*deriv[!min][j] > 0) && (TMath::Abs(deriv[min][j]) > TMath::Abs(deriv[!min][j])))
+                || (TMath::Abs(deriv[0][j]-deriv[1][j]) < 1.e-3) || (TMath::Abs(dder[j]) < 1.e-6)) 
         {
          shift[j] = -TMath::Sign (shift[j], (func2[0]-func2[1]) * (param0[0][j]-param0[1][j]));
          if (min == max) 
@@ -593,7 +592,7 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
        }
       } // for (Int_t j=0; j<fNpar;
         
-      if (estim < 1 && derMax < 2 || nLoop > 150) break; // minimum was found
+      if (((estim < 1) && (derMax < 2)) || nLoop > 150) break; // minimum was found
         
       nLoop++;
         
@@ -633,8 +632,8 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
       
     //if (fNpar > 2) cout << param0[min][fNpar-3] << " " << chi2n * (1+TMath::Min(1-param0[min][fNpar-3],0.25)) << endl;
     //if (chi2n*1.2+1.e-6 > chi2o ) 
-    if (fNpar > 2 && (chi2n > chi2o || iseed == nfit-1 
-                     && chi2n * (1+TMath::Min(1-param0[min][fNpar-3],0.25)) > chi2o)) 
+    if (fNpar > 2 && (chi2n > chi2o || ((iseed == nfit-1) 
+                                       && (chi2n * (1+TMath::Min(1-param0[min][fNpar-3],0.25)) > chi2o)))) 
       { fNpar -= 3; break; }
       
     // Save parameters and errors
@@ -693,7 +692,7 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster,
   if (fDebug) {
     for (Int_t i=0; i<fNpar; ++i) {
       if (i == 4 || i == 7) {
-       if (i == 7 || i == 4 && fNpar < 7) cout << parOk[i] << endl;
+       if ((i == 7) || ((i == 4) && (fNpar < 7))) cout << parOk[i] << endl;
        else cout << parOk[i] * (1-parOk[7]) << endl;
        continue;
       }
@@ -945,9 +944,9 @@ AliMUONClusterSplitterMLEM::Split(const AliMUONCluster& cluster,
           AliMUONPad* pad = cluster.Pad(j);
           //if ( pad->Status()==1 ) pad->SetStatus(0);
           //if ( pad->Status()==-9) pad->SetStatus(-5);
-          if ( pad->Status() == AliMUONClusterFinderMLEM::fgkUseForFit ||
-              pad->Status() == AliMUONClusterFinderMLEM::fgkCoupled) 
-           pad->SetStatus(AliMUONClusterFinderMLEM::fgkZero);
+          if ( pad->Status() == AliMUONClusterFinderMLEM::GetUseForFitFlag() ||
+              pad->Status() == AliMUONClusterFinderMLEM::GetCoupledFlag()) 
+           pad->SetStatus(AliMUONClusterFinderMLEM::GetZeroFlag());
         }
         // Merge the failed cluster candidates (with too few pads to fit) with 
         // the one with the strongest coupling
@@ -956,7 +955,7 @@ AliMUONClusterSplitterMLEM::Split(const AliMUONCluster& cluster,
       else 
       {
         // Do the fit
-        nfit = Fit(cluster,0, nForFit, clustFit, clusters, parOk, clusterList);
+        nfit = Fit(cluster,0, nForFit, clustFit, clusters, parOk, clusterList, mlem);
        if (nfit == 0) { 
          //cout << " (nfit == 0) " << fNpar << " " << cluster.Multiplicity() << endl; 
          fNpar = 0; // should be 0 by itself but just in case ...
@@ -973,8 +972,8 @@ AliMUONClusterSplitterMLEM::Split(const AliMUONCluster& cluster,
         AliMUONPad* pad = cluster.Pad(j);
        //if ( pad->Status()==1 ) pad->SetStatus(-2);
        //if ( pad->Status()==-9) pad->SetStatus(-5);
-       if ( pad->Status() == AliMUONClusterFinderMLEM::fgkUseForFit ) 
-         pad->SetStatus(AliMUONClusterFinderMLEM::fgkModified);
+       if ( pad->Status() == AliMUONClusterFinderMLEM::GetUseForFitFlag() ) 
+         pad->SetStatus(AliMUONClusterFinderMLEM::GetModifiedFlag());
       }
       
       // Sort the clusters (move to the right the used ones)
@@ -1014,7 +1013,7 @@ AliMUONClusterSplitterMLEM::Split(const AliMUONCluster& cluster,
         {
           AliMUONPad* pad = cluster.Pad(j);
           //if ( pad->Status() != -2) continue;
-          if ( pad->Status() != AliMUONClusterFinderMLEM::fgkModified) continue;
+          if ( pad->Status() != AliMUONClusterFinderMLEM::GetModifiedFlag()) continue;
           for (Int_t iclust=0; iclust<nCoupled; ++iclust) 
           {
             indx = clustNumb[iclust];
@@ -1030,7 +1029,7 @@ AliMUONClusterSplitterMLEM::Split(const AliMUONCluster& cluster,
             }
           }
           //pad->SetStatus(-8);
-          pad->SetStatus(AliMUONClusterFinderMLEM::fgkOver);
+          pad->SetStatus(AliMUONClusterFinderMLEM::GetOverFlag());
         } // for (Int_t j=0; j<npad;
       } // if (nCoupled > 3)
     } // while (nCoupled > 0)
@@ -1103,7 +1102,7 @@ AliMUONClusterSplitterMLEM::Merge(const AliMUONCluster& cluster,
     {
       AliMUONPad* pad = cluster.Pad(j);
       //if ( pad->Status() < 0 && pad->Status() != -5 ) continue;// exclude used pads
-      if ( pad->Status() != AliMUONClusterFinderMLEM::fgkZero) continue;// exclude used pads
+      if ( pad->Status() != AliMUONClusterFinderMLEM::GetZeroFlag()) continue;// exclude used pads
         aijclupad(imax,j) += aijclupad(indx,j);
         aijclupad(indx,j) = 0;
     }
@@ -1231,9 +1230,9 @@ AliMUONClusterSplitterMLEM::SelectPad(const AliMUONCluster& cluster,
         ++nOK; // pad to be used in fit
       }      
       */
-      if ( pad->Status() != AliMUONClusterFinderMLEM::fgkZero 
+      if ( pad->Status() != AliMUONClusterFinderMLEM::GetZeroFlag() 
           || pad->IsSaturated() ) continue; // used pads and overflows
-      pad->SetStatus(AliMUONClusterFinderMLEM::fgkUseForFit);
+      pad->SetStatus(AliMUONClusterFinderMLEM::GetUseForFitFlag());
       ++nOK; // pad to be used in fit
 
       if (nCoupled > 3) 
@@ -1257,7 +1256,7 @@ AliMUONClusterSplitterMLEM::SelectPad(const AliMUONCluster& cluster,
     if (padpix[j] < fgkCouplMin) continue;
     aaa += padpix[j];
     //cluster.Pad(j)->SetStatus(-1); // exclude pads with strong coupling to the other clusters
-    cluster.Pad(j)->SetStatus(AliMUONClusterFinderMLEM::fgkCoupled); // exclude pads with strong coupling to the other clusters
+    cluster.Pad(j)->SetStatus(AliMUONClusterFinderMLEM::GetCoupledFlag()); // exclude pads with strong coupling to the other clusters
     nOK--;
   }
   delete [] padpix; 
@@ -1278,7 +1277,7 @@ AliMUONClusterSplitterMLEM::UpdatePads(const AliMUONCluster& cluster,
   {
     AliMUONPad* pad = cluster.Pad(j);
     //if ( pad->Status() != -1 ) continue;
-    if ( pad->Status() != AliMUONClusterFinderMLEM::fgkCoupled ) continue;
+    if ( pad->Status() != AliMUONClusterFinderMLEM::GetCoupledFlag() ) continue;
     if (fNpar != 0) 
     {
       charge = 0;
@@ -1294,9 +1293,9 @@ AliMUONClusterSplitterMLEM::UpdatePads(const AliMUONCluster& cluster,
     } // if (fNpar != 0)
     
     //if (pad->Charge() > 6 /*fgkZeroSuppression*/) pad->SetStatus(0); 
-    if (pad->Charge() > 6 /*fgkZeroSuppression*/) pad->SetStatus(AliMUONClusterFinderMLEM::fgkZero); 
+    if (pad->Charge() > 6 /*fgkZeroSuppression*/) pad->SetStatus(AliMUONClusterFinderMLEM::GetZeroFlag()); 
     // return pad for further using // FIXME: remove usage of zerosuppression here
-    else pad->SetStatus(AliMUONClusterFinderMLEM::fgkOver); // do not use anymore
+    else pad->SetStatus(AliMUONClusterFinderMLEM::GetOverFlag()); // do not use anymore
     
   } // for (Int_t j=0;
 }