Using AliMpSegmentation instead of AliMpSegFactory which was removed

diff --git a/MUON/MUONCDB.C b/MUON/MUONCDB.C
index 92d8f7bf3a66628c02fd7744309d28a93fcbfd59..67f72d97ad6c1d4a39627e19fd1c541aa37bb0eb 100644 (file)
--- a/MUON/MUONCDB.C
+++ b/MUON/MUONCDB.C
@@ -37,9 +37,9 @@
 #include "AliMpDEIterator.h"
 #include "AliMpDEManager.h"
 #include "AliMpManuList.h"
-#include "AliMpSegFactory.h"
-#include "AliMpStationType.h"
+#include "AliMpSegmentation.h"
 #include "AliMpVSegmentation.h"
+#include "AliMpStationType.h"
 #include "Riostream.h"
 #include "TH1F.h"
 #include "TList.h"
@@ -49,7 +49,7 @@
 #endif
 
 //_____________________________________________________________________________
-Int_t countChannels(AliMpVSegmentation& seg)
+Int_t countChannels(const AliMpVSegmentation& seg)
 {
   Int_t n(0);
   
@@ -63,13 +63,6 @@ Int_t countChannels(AliMpVSegmentation& seg)
   return n;
 }
 
-//_____________________________________________________________________________
-AliMpSegFactory* segFactory()
-{
-  static AliMpSegFactory* sf = new AliMpSegFactory();
-  return sf;
-}
-
 //_____________________________________________________________________________
 void countChannels()
 {
@@ -87,7 +80,8 @@ void countChannels()
       Int_t de = it.CurrentDE();
       for ( Int_t cathode = 0; cathode < 2; ++cathode )
       {
-        AliMpVSegmentation* seg = segFactory()->CreateMpSegmentation(de,cathode);
+        const AliMpVSegmentation* seg 
+         = AliMpSegmentation::Instance()->GetMpSegmentation(de,cathode);
         n += countChannels(*seg);
       }
       it.Next();
@@ -275,8 +269,8 @@ void getBoundaries(const AliMUONV2DStore& store,
     Int_t detElemId = p->GetFirst();
     Int_t manuId = p->GetSecond();
         
-    AliMpVSegmentation* seg = 
-      segFactory()->CreateMpSegmentationByElectronics(detElemId,manuId);
+    const AliMpVSegmentation* seg = 
+      AliMpSegmentation::Instance()->GetMpSegmentationByElectronics(detElemId,manuId);
           
     AliMUONVCalibParam* value = 
       dynamic_cast<AliMUONVCalibParam*>(store.Get(detElemId,manuId));
@@ -348,8 +342,8 @@ void plot(const AliMUONV2DStore& store, const char* name, Int_t nbins)
     Int_t manuId = p->GetSecond();
     Int_t station = AliMpDEManager::GetChamberId(detElemId);
     
-    AliMpVSegmentation* seg = 
-      segFactory()->CreateMpSegmentationByElectronics(detElemId,manuId);
+    const AliMpVSegmentation* seg = 
+      AliMpSegmentation::Instance()->GetMpSegmentationByElectronics(detElemId,manuId);
     
     AliMUONVCalibParam* value = 
       dynamic_cast<AliMUONVCalibParam*>(store.Get(detElemId,manuId));
@@ -446,8 +440,8 @@ Int_t makePedestalStore(AliMUONV2DStore& pedestalStore, Bool_t defaultValues)
         
     Int_t manuId = p->GetSecond();
     
-    AliMpVSegmentation* seg = 
-      segFactory()->CreateMpSegmentationByElectronics(detElemId,manuId);
+    const AliMpVSegmentation* seg = 
+      AliMpSegmentation::Instance()->GetMpSegmentationByElectronics(detElemId,manuId);
     
     for ( Int_t manuChannel = 0; manuChannel < nChannels; ++manuChannel )
     {
@@ -521,8 +515,8 @@ Int_t makeGainStore(AliMUONV2DStore& gainStore, Bool_t defaultValues)
     Int_t detElemId = p->GetFirst();
     Int_t manuId = p->GetSecond();
 
-    AliMpVSegmentation* seg = 
-      segFactory()->CreateMpSegmentationByElectronics(detElemId,manuId);
+    const AliMpVSegmentation* seg = 
+      AliMpSegmentation::Instance()->GetMpSegmentationByElectronics(detElemId,manuId);
 
     for ( Int_t manuChannel = 0; manuChannel < nChannels; ++manuChannel )
     {
@@ -587,8 +581,8 @@ Int_t makeDeadStore(AliMUONV2DStore& deadStore, Bool_t defaultValues)
     Int_t detElemId = p->GetFirst();
     Int_t manuId = p->GetSecond();
     
-    AliMpVSegmentation* seg = 
-      segFactory()->CreateMpSegmentationByElectronics(detElemId,manuId);
+    const AliMpVSegmentation* seg = 
+      AliMpSegmentation::Instance()->GetMpSegmentationByElectronics(detElemId,manuId);
     
     for ( Int_t manuChannel = 0; manuChannel < nChannels; ++manuChannel )
     {

diff --git a/MUON/MUONCheck.C b/MUON/MUONCheck.C
index 8aefd6a2f0651eea6218260feec61986e9f77560..fb6c203a502187871acdbdeaf04f0fb7268fe8b4 100644 (file)
--- a/MUON/MUONCheck.C
+++ b/MUON/MUONCheck.C
@@ -54,10 +54,10 @@
 #include "AliMUONTriggerCircuit.h"
 #include "AliMUONTriggerCrateStore.h"
 
+#include "AliMpSegmentation.h"
 #include "AliMpVSegmentation.h"
 #include "AliMpIntPair.h"
 #include "AliMpDEManager.h"
-#include "AliMpSegFactory.h"
 #endif
 
 void MUONkine(Int_t event2Check=0, char * filename="galice.root")
@@ -242,8 +242,8 @@ void MUONoccupancy(Int_t event2Check=0,  Bool_t perDetEle =kFALSE, char * filena
   Int_t ievent, nevents;
   nevents = RunLoader->GetNumberOfEvents();
   AliMUONDigit * mDigit =0x0;
-  AliMpVSegmentation * segbend = 0x0;
-  AliMpVSegmentation * segnonbend = 0x0;
+  const AliMpVSegmentation * segbend = 0x0;
+  const AliMpVSegmentation * segnonbend = 0x0;
   AliMpIntPair pad(0,0);
 
   Int_t dEoccupancy_bending[14][26];
@@ -263,8 +263,6 @@ void MUONoccupancy(Int_t event2Check=0,  Bool_t perDetEle =kFALSE, char * filena
   Int_t ichamber, nchambers,idetele, detele, ix, iy;
   nchambers = AliMUONConstants::NCh(); ;
 
-  AliMpSegFactory factory;
-
   for (ichamber=0; ichamber<nchambers; ichamber++) {
     cHchannels_bending[ichamber]=0;
     cHchannels_nonbending[ichamber]=0;
@@ -276,10 +274,10 @@ void MUONoccupancy(Int_t event2Check=0,  Bool_t perDetEle =kFALSE, char * filena
       dEoccupancy_nonbending[ichamber][idetele]=0;
       if ( AliMpDEManager::IsValidDetElemId(detele) ) {
        
-       segbend    =  factory.CreateMpSegmentation(detele, 0);
-       segnonbend =  factory.CreateMpSegmentation(detele, 1);
+       segbend    = AliMpSegmentation::Instance()->GetMpSegmentation(detele, 0);
+       segnonbend = AliMpSegmentation::Instance()->GetMpSegmentation(detele, 1);
         if (AliMpDEManager::GetPlaneType(detele, 0) != kBendingPlane ) {
-         AliMpVSegmentation* tmp = segbend;
+         const AliMpVSegmentation* tmp = segbend;
          segbend    =  segnonbend;
          segnonbend =  tmp;
        }  
@@ -316,8 +314,6 @@ void MUONoccupancy(Int_t event2Check=0,  Bool_t perDetEle =kFALSE, char * filena
   printf(">>Spectrometer has  %7d channels in bending and %7d channels in nonbending \n",
         totalchannels_bending, totalchannels_nonbending);
 
-  factory.DeleteSegmentations();
-
   ievent=event2Check;
   printf(">>> Event %d \n",ievent);
   RunLoader->GetEvent(ievent);
@@ -457,8 +453,6 @@ void MUONrectrigger (Int_t event2Check=0, char * filename="galice.root", Int_t W
   AliMUONTriggerCrateStore* crateManager = new AliMUONTriggerCrateStore();   
   crateManager->ReadFromFile();
 
-  AliMpSegFactory* segFactory = new AliMpSegFactory();
-    
   AliMUONGeometryTransformer* transformer = new AliMUONGeometryTransformer(kFALSE);
   transformer->ReadGeometryData("volpath.dat", "geometry.root");
 
@@ -466,7 +460,6 @@ void MUONrectrigger (Int_t event2Check=0, char * filename="galice.root", Int_t W
 
   for (Int_t i = 0; i < AliMUONConstants::NTriggerCircuit(); i++)  {
       AliMUONTriggerCircuit* c = new AliMUONTriggerCircuit();
-      c->SetSegFactory(segFactory);
       c->SetTransformer(transformer);
       c->Init(i,*crateManager);
       TClonesArray& circuit = *triggerCircuit;
@@ -580,7 +573,6 @@ void MUONrectrigger (Int_t event2Check=0, char * filename="galice.root", Int_t W
   MUONLoader->UnloadRecPoints();
 
   delete crateManager;
-  delete segFactory;
   delete transformer;
   delete triggerCircuit;