Merge branch 'master' into TPCdev

[u/mrichter/AliRoot.git] / STEER / STEER / AliGeomManager.h

diff --git a/STEER/STEER/AliGeomManager.h b/STEER/STEER/AliGeomManager.h
index cd0f05fd274726ddbb4017874d90d544cca51ca0..983237a6396ab3f29c0d183f0e2903de1fc17ca3 100644 (file)
--- a/STEER/STEER/AliGeomManager.h
+++ b/STEER/STEER/AliGeomManager.h
@@ -86,8 +86,6 @@ public:
 
   static Bool_t         ApplyAlignObjsToGeom(const char* fileName,
                                      const char* clArrayName);
-  static Bool_t         ApplyAlignObjsToGeom(AliCDBParam* param,
-                                     AliCDBId& Id);
   static Bool_t         ApplyAlignObjsToGeom(const char* uri, const char* path,
                                      Int_t runnum, Int_t version,
                                      Int_t sversion);
@@ -123,13 +121,7 @@ public:
   static const char* fgLayerName[kLastLayer - kFirstLayer]; // Name of layers
   static TGeoPNEntry** fgPNEntry[kLastLayer - kFirstLayer]; // TGeoPNEntries
   static AliAlignObj** fgAlignObjs[kLastLayer - kFirstLayer]; // Alignment objects
-//   #ifdef MFT_UPGRADE
-//   static const Int_t   fgkNDetectors = 16;              // number of detectors
-//   #else
-//   static const Int_t   fgkNDetectors = 15;              // number of detectors
-//   #endif
-  //static const Int_t   fgkNDetectors = 16;              // number of detectors    // AU
-  static const Int_t   fgkNDetectors = 17;              // number of detectors    + AD
+  static const Int_t   fgkNDetectors = 18;              // number of detectors    + AD
   static const char *  fgkDetectorName[fgkNDetectors] ; // name of detectors
   static Int_t       fgNalignable[fgkNDetectors];