First version of a jet analysis deriving from AliAnalysisTask.

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

diff --git a/MUON/AliMUONSegFactory.cxx b/MUON/AliMUONSegFactory.cxx
index 6000b043c257f1bedab478b5a8cc78fc96b276cf..633bc22d8921957a6487440e3206246e4fc9db10 100644 (file)
--- a/MUON/AliMUONSegFactory.cxx
+++ b/MUON/AliMUONSegFactory.cxx
@@ -33,8 +33,7 @@
 #include "AliMUONGeometrySegmentation.h"
 #include "AliMUONSt12QuadrantSegmentation.h"
 #include "AliMUONSt345SlatSegmentation.h"
-#include "AliMUONSt345SlatSegmentationV2.h"
-#include "AliMUONTriggerSegmentationV2.h"
+#include "AliMUONTriggerSegmentation.h"
 
 #include "AliMpDEManager.h"
 #include "AliMpDEIterator.h"
@@ -173,7 +172,7 @@ AliMUONSegFactory::CreateDESegmentation(Int_t detElemId, Int_t cath)
   // Get DE segmentation for this DE type, create it if it does not exist 
   // 
   AliMUONVGeometryDESegmentation* deSegmentation = 0;
-  TString deName = AliMpDEManager::GetDEName(detElemId, cath);
+  TString deName = AliMpDEManager::GetDESegName(detElemId, cath);
   TObject* objSegmentation = fDESegmentations.Get(deName);
   if ( objSegmentation ) 
     deSegmentation = (AliMUONVGeometryDESegmentation*)objSegmentation;  
@@ -205,7 +204,7 @@ AliMUONSegFactory::CreateDESegmentation(Int_t detElemId, Int_t cath)
         break;
         
       case kStation345:                  
-        deSegmentation = new AliMUONSt345SlatSegmentationV2(
+        deSegmentation = new AliMUONSt345SlatSegmentation(
                                 mpSegmentation, detElemId, planeType); 
         //cout << "   new AliMUONSt345SlatSegmentationV2 "                       
        //     << StationTypeName(stationType) << "  "  
@@ -214,9 +213,9 @@ AliMUONSegFactory::CreateDESegmentation(Int_t detElemId, Int_t cath)
         break;
     
       case kStationTrigger:              
-        deSegmentation = new AliMUONTriggerSegmentationV2(
+        deSegmentation = new AliMUONTriggerSegmentation(
                                 mpSegmentation, detElemId, planeType); 
-        //cout << "   new AliMUONTriggerSegmentationV2 "                         
+        //cout << "   new AliMUONTriggerSegmentation "                   
        //     << StationTypeName(stationType) << "  "  
        //     << PlaneTypeName(planeType) << "  "                        
        //     << deName << endl;                                 
@@ -254,28 +253,10 @@ AliMUONSegFactory::CreateModuleSegmentations(Int_t chamberId, Int_t cath)
     
 //______________________________________________________________________________
 AliMUONSegmentation*  
-AliMUONSegFactory::CreateSegmentation(const TString& option)
+AliMUONSegFactory::CreateSegmentation()
 {
 /// Create segmentations on all levels and return their container.
 
-  // Check options
-  if ( option != "default"   && 
-       option != "FactoryV2" && 
-       option != "FactoryV3" &&
-       option != "FactoryV4" &&
-       option != "new") {
-
-    AliErrorStream() << "Option " << option << " not defined." << endl;
-    return 0;
-  }         
- 
-  if ( option == "FactoryV2" || option == "FactoryV3" ) { 
-
-    AliErrorStream() 
-      << "Option " << option << " not supported anymore." << endl;
-    return 0;
-  }         
-
   for (Int_t chamberId = 0; chamberId<AliMUONConstants::NCh(); chamberId++)
     for (Int_t cath = 0; cath < 2; cath++) {
       if ( IsGeometryDefined(chamberId) )