reduce arguments AddTaskPWG4HighPtTrackQA

[u/mrichter/AliRoot.git] / HMPID / AliHMPIDCluster.cxx

diff --git a/HMPID/AliHMPIDCluster.cxx b/HMPID/AliHMPIDCluster.cxx
index 7a56f04448e0f13089b68d02190de1343cd7c5de..0265c5b619d04491933f0f341fa79e5c243fde95 100644 (file)
--- a/HMPID/AliHMPIDCluster.cxx
+++ b/HMPID/AliHMPIDCluster.cxx
@@ -32,6 +32,13 @@ void AliHMPIDCluster::SetClusterParams(Double_t xL,Double_t yL,Int_t iCh  )
   //Set the cluster properties for the AliCluster3D part
   //------------------------------------------------------------------------
 
+  fParam = AliHMPIDParam::Instance();
+    
+  if(!fParam->GetInstType())               //if there is no geometry we cannot retrieve the volId (only for monitoring)
+  {
+    new(this) AliCluster3D(); return;
+  }
+  
   //Get the volume ID from the previously set PNEntry
   UShort_t volId=AliGeomManager::LayerToVolUID(AliGeomManager::kHMPID,iCh);
 
@@ -39,7 +46,7 @@ void AliHMPIDCluster::SetClusterParams(Double_t xL,Double_t yL,Int_t iCh  )
   //get L->T cs matrix for a given chamber
   const TGeoHMatrix *t2l= AliGeomManager::GetTracking2LocalMatrix(volId);
 
-  fparam = AliHMPIDParam::Instance();
+  fParam = AliHMPIDParam::Instance();
 
   //transformation from the pad cs to local
   xL -= 0.5*fParam->SizeAllX();      //size of all pads with dead zones included
@@ -74,7 +81,7 @@ void AliHMPIDCluster::SetClusterParams(Double_t xL,Double_t yL,Int_t iCh  )
 AliHMPIDCluster::~AliHMPIDCluster()
 {
   if(fDigs)  delete fDigs; fDigs=0;
-  if(fParam) delete fParam; fParam=0;
+  //PH  if(fParam) delete fParam; fParam=0;
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 void AliHMPIDCluster::CoG()
@@ -278,11 +285,8 @@ Int_t AliHMPIDCluster::Solve(TClonesArray *pCluLst,Int_t *pSigmaCut, Bool_t isTr
 //Phase 0. Initialise Fitter  
   Double_t arglist[10];
   Int_t ierflg = 0;
-  TVirtualFitter *fitter = TVirtualFitter::Fitter(this,3*6);                            //initialize Fitter
-
-  delete fitter;                                                                        //temporary solution to avoid the inteference with previous instances
-  fitter = TVirtualFitter::Fitter(this,3*6);                                            //initialize Fitter
-
+  TVirtualFitter* fitter = TVirtualFitter::Fitter(this,3*6);                       //initialize Fitter
+  //
   arglist[0] = -1;
   ierflg = fitter->ExecuteCommand("SET PRI", arglist, 1);                               // no printout
   ierflg = fitter->ExecuteCommand("SET NOW", arglist, 0);                               //no warning messages
@@ -338,15 +342,14 @@ Int_t AliHMPIDCluster::Solve(TClonesArray *pCluLst,Int_t *pSigmaCut, Bool_t isTr
    fSt=kNoLoc;
    SetClusterParams(fXX,fYY,fCh);                                                          //need to fill the AliCluster3D part
    new ((*pCluLst)[iCluCnt++]) AliHMPIDCluster(*this);                                    //add new unfolded cluster
-   
    return fNlocMax;
  }
 
 // case 2 -> loc max found. Check # of loc maxima 
  if ( fNlocMax >= kMaxLocMax)  { 
- SetClusterParams(fXX,fYY,fCh);                                                           // if # of local maxima exceeds kMaxLocMax...
+   SetClusterParams(fXX,fYY,fCh);                                                           // if # of local maxima exceeds kMaxLocMax...
    fSt = kMax;   new ((*pCluLst)[iCluCnt++]) AliHMPIDCluster(*this);                      //...add this raw cluster  
-   } else {                                                                               //or resonable number of local maxima to fit and user requested it
+ } else {                                                                               //or resonable number of local maxima to fit and user requested it
   // Now ready for minimization step
    arglist[0] = 500;                                                                      //number of steps and sigma on pads charges
    arglist[1] = 1.;                                                                       //