remove AliMUONTriggerConstants (Philippe)
authorpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Oct 2006 15:38:54 +0000 (15:38 +0000)
committerpcrochet <pcrochet@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 24 Oct 2006 15:38:54 +0000 (15:38 +0000)
MUON/AliMUONResponseFactory.cxx
MUON/AliMUONSegFactory.cxx
MUON/AliMUONTriggerCircuitNew.cxx
MUON/AliMUONTriggerConstants.cxx [deleted file]
MUON/AliMUONTriggerConstants.h [deleted file]
MUON/AliMUONTriggerSegmentation.cxx
MUON/MUONbaseLinkDef.h
MUON/libMUONbase.pkg

index 57fad2f..9e3651d 100644 (file)
@@ -29,7 +29,6 @@
 
 #include "AliMUON.h"
 #include "AliMUONConstants.h"
-#include "AliMUONTriggerConstants.h"
 #include "AliMUONChamber.h"
 #include "AliMUONResponseV0.h"
 #include "AliMUONResponseTrigger.h"
index 858c454..b2a2ddd 100644 (file)
@@ -36,7 +36,6 @@
 #include "AliMUONSt345SlatSegmentationV2.h"
 #include "AliMUONTriggerSegmentation.h"
 #include "AliMUONTriggerSegmentationV2.h"
-#include "AliMUONTriggerConstants.h"
 
 #include "AliMpDEManager.h"
 #include "AliMpDEIterator.h"
index 07529d8..476b91f 100644 (file)
@@ -27,7 +27,6 @@
 #include "AliMUONTriggerCircuitNew.h"
 #include "AliRun.h"
 #include "AliMUON.h"
-#include "AliMUONTriggerConstants.h"
 #include "AliMUONConstants.h"
 #include "AliLog.h"
 #include "AliMUONLocalTriggerBoard.h"
diff --git a/MUON/AliMUONTriggerConstants.cxx b/MUON/AliMUONTriggerConstants.cxx
deleted file mode 100644 (file)
index 0a996f2..0000000
+++ /dev/null
@@ -1,250 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-/* $Id$ */
-
-// ------------------
-// Class AliMUONTriggerConstants
-// ------------------
-// constants for building the trigger segmentation
-// to be removed soon (the next version is based on mapping only)
-
-#include "AliMUONTriggerConstants.h"
-
-/// \cond CLASSIMP
-ClassImp(AliMUONTriggerConstants)
-/// \endcond
-
-//----------------------------------------------------------------------
-AliMUONTriggerConstants::AliMUONTriggerConstants()
-  : TNamed()
-{
-/// Default constructor
-}
-//----------------------------------------------------------------------
-AliMUONTriggerConstants::~AliMUONTriggerConstants()
-{
-/// Destructor
-}
-
-//----------------------------------------------------------------------
-const Int_t AliMUONTriggerConstants::fgkNmodule = 126;
-
-//----------------------------------------------------------------------
-// conv : line-column (line : from top to bottom, column : from left to right)
-const Int_t AliMUONTriggerConstants::fgkModuleId[126] = 
-{11,12,13,14,15,16,17,         // right side of the chamber
- 21,22,23,24,25,26,27,
- 31,32,33,34,35,36,37,
- 41,42,43,44,45,46,47,
- 51,52,53,54,55,56,57,
- 61,62,63,64,65,66,67,
- 71,72,73,74,75,76,77,
- 81,82,83,84,85,86,87,
- 91,92,93,94,95,96,97,   
- -11,-12,-13,-14,-15,-16,-17,  // right side of chamber
- -21,-22,-23,-24,-25,-26,-27,
- -31,-32,-33,-34,-35,-36,-37,
- -41,-42,-43,-44,-45,-46,-47,
- -51,-52,-53,-54,-55,-56,-57,
- -61,-62,-63,-64,-65,-66,-67,
- -71,-72,-73,-74,-75,-76,-77,
- -81,-82,-83,-84,-85,-86,-87,
- -91,-92,-93,-94,-95,-96,-97};
-
-//----------------------------------------------------------------------
-const Int_t AliMUONTriggerConstants::fgkNstripX[126]=
-{16,16,16,16,16,16,16,  // right side of the chamber 
- 32,32,32,32,32,32,16,
- 32,32,32,32,32,32,16,
- 48,64,64,32,32,32,16,
- 0,64,64,32,32,32,16,
- 48,64,64,32,32,32,16,
- 32,32,32,32,32,32,16,
- 32,32,32,32,32,32,16,
- 16,16,16,16,16,16,16,  // left side of the chamber
- 16,16,16,16,16,16,16,
- 32,32,32,32,32,32,16,
- 32,32,32,32,32,32,16,
- 48,64,64,32,32,32,16,
- 0,64,64,32,32,32,16,
- 48,64,64,32,32,32,16,
- 32,32,32,32,32,32,16,
- 32,32,32,32,32,32,16,
- 16,16,16,16,16,16,16};
-
-//----------------------------------------------------------------------  
-const Int_t AliMUONTriggerConstants::fgkNstripY[126]=
-{ 8, 8, 8, 8, 8, 8,16,  // right side of the chamber
-  8, 8, 8, 8, 8, 8,16,
-  16,16,16,16,16, 8,16,
-  16,16,16,16,16, 8,16,
-  0, 8,16,16,16, 8,16,
-  16,16,16,16,16, 8,16,
-  16,16,16,16,16, 8,16,
-  8, 8, 8, 8, 8, 8,16,
-  8, 8, 8, 8, 8, 8,16,  
-  8, 8, 8, 8, 8, 8,16,  // left side of the chamber
-  8, 8, 8, 8, 8, 8,16,
-  16,16,16,16,16, 8,16,
-  16,16,16,16,16, 8,16,
-  0, 8,16,16,16, 8,16,
-  16,16,16,16,16, 8,16,
-  16,16,16,16,16, 8,16,
-  8, 8, 8, 8, 8, 8,16,
-  8, 8, 8, 8, 8, 8,16};
-
-//----------------------------------------------------------------------  
-const Float_t AliMUONTriggerConstants::fgkXcMin[126]=
-{
- 2.,36.,70.,104.,138.,172.,206., // left
- 2.,36.,70.,104.,138.,172.,206.,
- 2.,36.,70.,104.,138.,172.,206.,
- 2.,36.,70.,104.,138.,172.,206.,
- 0.,53.,70.,104.,138.,172.,206.,
- 2.,36.,70.,104.,138.,172.,206.,
- 2.,36.,70.,104.,138.,172.,206.,
- 2.,36.,70.,104.,138.,172.,206.,
- 2.,36.,70.,104.,138.,172.,206.,
- -36.,-70.,-104.,-138.,-172.,-206.,-257., //right
- -36.,-70.,-104.,-138.,-172.,-206.,-257.,
- -36.,-70.,-104.,-138.,-172.,-206.,-257.,
- -36.,-70.,-104.,-138.,-172.,-206.,-257.,
-   0.,-70.,-104.,-138.,-172.,-206.,-257.,
- -36.,-70.,-104.,-138.,-172.,-206.,-257.,
- -36.,-70.,-104.,-138.,-172.,-206.,-257.,
- -36.,-70.,-104.,-138.,-172.,-206.,-257.,
- -36.,-70.,-104.,-138.,-172.,-206.,-257.,
- };
-
-//----------------------------------------------------------------------  
-const Float_t AliMUONTriggerConstants::fgkXcMax[126]=
-{
- 36.,70.,104.,138.,172.,206.,257., //left
- 36.,70.,104.,138.,172.,206.,257.,
- 36.,70.,104.,138.,172.,206.,257.,
- 36.,70.,104.,138.,172.,206.,257.,
-  0.,70.,104.,138.,172.,206.,257.,
- 36.,70.,104.,138.,172.,206.,257.,
- 36.,70.,104.,138.,172.,206.,257.,
- 36.,70.,104.,138.,172.,206.,257.,
- 36.,70.,104.,138.,172.,206.,257., 
- -2.,-36.,-70.,-104.,-138.,-172.,-206., // right
- -2.,-36.,-70.,-104.,-138.,-172.,-206.,
- -2.,-36.,-70.,-104.,-138.,-172.,-206.,
- -2.,-36.,-70.,-104.,-138.,-172.,-206.,
-  0.,-53.,-70.,-104.,-138.,-172.,-206.,
- -2.,-36.,-70.,-104.,-138.,-172.,-206.,
- -2.,-36.,-70.,-104.,-138.,-172.,-206.,
- -2.,-36.,-70.,-104.,-138.,-172.,-206.,
- -2.,-36.,-70.,-104.,-138.,-172.,-206.,
-};
-
-//----------------------------------------------------------------------  
-const Int_t AliMUONTriggerConstants::fgkCircuitId[234]=
-{111, 121, 131, 141, 151, 161, 171,
- 211, 212, 221, 222, 231, 232, 241, 242, 251, 252, 261, 262, 271,
- 311, 312, 321, 322, 331, 332, 341, 342, 351, 352, 361, 362, 371,
- 411, 412, 413, 421, 422, 423, 424, 431, 432, 433, 434, 441, 442, 
- 451, 452, 461, 462, 471,
- 521, 522, 523, 524, 531, 532, 533, 534, 541, 542, 551, 552, 561, 562, 571, 
- 611, 612, 613, 621, 622, 623, 624, 631, 632, 633, 634, 641, 642,
- 651, 652, 661, 662, 671,
- 711, 712, 721, 722, 731, 732, 741, 742, 751, 752, 761, 762, 771,
- 811, 812, 821, 822, 831, 832, 841, 842, 851, 852, 861, 862, 871,
- 911, 921, 931, 941, 951, 961, 971,
- -111, -121, -131, -141, -151, -161, -171,
- -211, -212, -221, -222, -231, -232, -241, -242, -251, -252, -261, -262, -271,
- -311, -312, -321, -322, -331, -332, -341, -342, -351, -352, -361, -362, -371,
- -411, -412, -413, -421, -422, -423, -424, -431, -432, -433, -434, -441, -442, 
- -451, -452, -461, -462, -471,
- -521, -522, -523, -524, -531, -532, -533, -534, -541, -542, -551, -552, -561, -562, -571, 
- -611, -612, -613, -621, -622, -623, -624, -631, -632, -633, -634, -641, -642,
- -651, -652, -661, -662, -671,
- -711, -712, -721, -722, -731, -732, -741, -742, -751, -752, -761, -762, -771,
- -811, -812, -821, -822, -831, -832, -841, -842, -851, -852, -861, -862, -871,
- -911, -921, -931, -941, -951, -961, -971};
-
-//----------------------------------------------------------------------  
-const Float_t AliMUONTriggerConstants::fgkStripWidth[3]={1.0625, 2.125, 4.25};
-
-//----------------------------------------------------------------------  
-const Float_t AliMUONTriggerConstants::fgkStripLength[4]={17., 34., 51., 68.};
-
-//----------------------------------------------------------------------
-// methods which returns public static const data
-//----------------------------------------------------------------------
-Int_t AliMUONTriggerConstants::Nmodule()
-{
-/// returns fgkNmodule
-    return fgkNmodule;    
-}
-//----------------------------------------------------------------------
-Int_t AliMUONTriggerConstants::ModuleId(Int_t imodule)
-{
-/// returns fgkModuleId
-    return fgkModuleId[imodule];
-}
-//----------------------------------------------------------------------
-Int_t AliMUONTriggerConstants::NstripX(Int_t imodule) 
-{
-/// returns fgkNstripX
-    return fgkNstripX[imodule];
-}
-//----------------------------------------------------------------------
-Int_t AliMUONTriggerConstants::NstripY(Int_t imodule)
-{
-/// return fgkNstripY
-    return fgkNstripY[imodule];
-}
-//----------------------------------------------------------------------
-Float_t AliMUONTriggerConstants::XcMin(Int_t imodule)
-{
-/// returns fgkXcMin
-    return fgkXcMin[imodule];
-}
-//----------------------------------------------------------------------
-Float_t AliMUONTriggerConstants::XcMax(Int_t imodule)
-{
-/// returns fgkXcMax
-    return fgkXcMax[imodule];
-}
-//----------------------------------------------------------------------
-Int_t AliMUONTriggerConstants::CircuitId(Int_t icircuit)
-{
-/// returns fgkCircuitId
-    return fgkCircuitId[icircuit];
-}
-//----------------------------------------------------------------------
-Float_t AliMUONTriggerConstants::StripWidth(Int_t istrip)
-{
-/// returns fgkStripWidth
-    return fgkStripWidth[istrip];
-}
-//----------------------------------------------------------------------
-Float_t AliMUONTriggerConstants::StripLength(Int_t istrip)
-{
-/// returns fgkStripLength
-    return fgkStripLength[istrip];
-}
-
-
-
-
-
-
-
-
-
diff --git a/MUON/AliMUONTriggerConstants.h b/MUON/AliMUONTriggerConstants.h
deleted file mode 100644 (file)
index b1c4a50..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#ifndef ALIMUONTRIGGERCONSTANTS_H
-#define ALIMUONTRIGGERCONSTANTS_H
-
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-// Revision of includes 07/05/2004
-//
-/// \ingroup base
-/// \class AliMUONTriggerConstants
-/// \brief MUON Trigger constants
-
-#include <TNamed.h>
-
-class AliMUONTriggerConstants : public TNamed 
-{    
- public:
-  AliMUONTriggerConstants();
-  ~AliMUONTriggerConstants();
-  
-public:
-  static Int_t Nmodule();              
-  static Int_t ModuleId(Int_t imodule);
-  static Int_t NstripX(Int_t imodule);
-  static Int_t NstripY(Int_t imodule);
-  static Float_t XcMin(Int_t imodule); 
-  static Float_t XcMax(Int_t imodule);
-  static Int_t CircuitId(Int_t icircuit);
-  static Float_t StripWidth(Int_t istrip);
-  static Float_t StripLength(Int_t istrip);
-  
-private:
-  static const Int_t fgkNmodule;        ///< total number of module
-  static const Int_t fgkModuleId[126];  ///< module Id. number
-  static const Int_t fgkNstripX[126];   ///< number of X strips 
-  static const Int_t fgkNstripY[126];   ///< number of Y strips 
-  static const Float_t fgkXcMin[126];   ///< min X pos of module
-  static const Float_t fgkXcMax[126];   ///< max X poa of module 
-  static const Int_t fgkCircuitId[234]; ///< circuit Id. number
-  static const Float_t fgkStripWidth[3]; ///< strip width
-  static const Float_t fgkStripLength[4]; ///< strip length
-  
-  ClassDef(AliMUONTriggerConstants,1) // Trigger Constants class
-
-};
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
index abd2000..32f4193 100644 (file)
@@ -149,7 +149,7 @@ void AliMUONTriggerSegmentation::GetPadLoc2Glo(Int_t ixLoc, Int_t iyLoc,
 {    
 /// converts ixLoc & iyLoc into ixGlo & iyGLo (module,strip number)
 
-    ixGlo = 0; // see AliMUONTriggerConstants::fgkModuleI
+    ixGlo = 0; // 
     iyGlo = 0; // from 0 to (fNtrip-1) in module   
     if (fBending) { 
        ixGlo = 10*fLineNumber + ixLoc;
index 23f8db4..48de803 100644 (file)
@@ -19,7 +19,6 @@
 
 // info classes 
 #pragma link C++ class AliMUONConstants+; 
-#pragma link C++ class AliMUONTriggerConstants+; 
 #pragma link C++ class AliMUONDataInterface+; 
 #pragma link C++ class AliMUONLoader+; 
 #pragma link C++ class AliMUONChamber+; 
index 9635d53..2fcf9e6 100644 (file)
@@ -3,7 +3,6 @@
 SRCS:=  AliMUON.cxx AliMUONv1.cxx \
         AliMUONMathieson.cxx \
         AliMUONConstants.cxx \
-        AliMUONTriggerConstants.cxx \
         AliMUONDataInterface.cxx \
         AliMUONLoader.cxx \
         AliMUONChamber.cxx \