From be2a6782008c1993e23c512ad297d2f106aa100a Mon Sep 17 00:00:00 2001 From: martinez Date: Thu, 18 Sep 2003 08:46:58 +0000 Subject: [PATCH] Update for station2: added AliMpStationType argument to functions; added fgkStationDir attribute. Coding conventions corrections. (I.Hrivnacova) --- MUON/mapping/AliMpFiles.cxx | 85 ++++++++++++++++++++++++++++--------- MUON/mapping/AliMpFiles.h | 52 +++++++++++++---------- 2 files changed, 95 insertions(+), 42 deletions(-) diff --git a/MUON/mapping/AliMpFiles.cxx b/MUON/mapping/AliMpFiles.cxx index 307bde5e90e..a77be8491c7 100755 --- a/MUON/mapping/AliMpFiles.cxx +++ b/MUON/mapping/AliMpFiles.cxx @@ -21,11 +21,13 @@ ClassImp(AliMpFiles) AliMpFiles* AliMpFiles::fgInstance = 0; const TString AliMpFiles::fgkDefaultTop = getenv("MINSTALL"); -const TString AliMpFiles::fgkDataDir = "/data";; -const TString AliMpFiles::fgkBendingDir = "/bending_plane/";; -const TString AliMpFiles::fgkNonBendingDir = "/non-bending_plane/";; +const TString AliMpFiles::fgkDataDir = "/data"; +const TString AliMpFiles::fgkStationDir = "/station"; +const TString AliMpFiles::fgkBendingDir = "/bending_plane/"; +const TString AliMpFiles::fgkNonBendingDir = "/non-bending_plane/"; const TString AliMpFiles::fgkSector = "zones"; const TString AliMpFiles::fgkSectorSpecial = "zones_special"; +const TString AliMpFiles::fgkSectorSpecial2 = "zones_special_outer"; const TString AliMpFiles::fgkMotifPrefix = "motif"; const TString AliMpFiles::fgkMotifSpecialPrefix ="motifSpecial"; const TString AliMpFiles::fgkPadPosPrefix = "padPos"; @@ -34,7 +36,8 @@ const TString AliMpFiles::fgkBergToGCFileName = "/bergToGC"; //______________________________________________________________________________ AliMpFiles::AliMpFiles() - : fTop(fgkDefaultTop) + : TObject(), + fTop(fgkDefaultTop) { // if (fgInstance) { @@ -46,7 +49,9 @@ AliMpFiles::AliMpFiles() } //______________________________________________________________________________ -AliMpFiles::AliMpFiles(const AliMpFiles& right) { +AliMpFiles::AliMpFiles(const AliMpFiles& right) + : TObject(right) +{ // Fatal("AliMpFiles", "Attempt to copy AliMpFiles singleton."); } @@ -77,7 +82,8 @@ AliMpFiles& AliMpFiles::operator=(const AliMpFiles& right) // //______________________________________________________________________________ -TString AliMpFiles::PlaneDataDir(AliMpPlaneType plane) const +TString AliMpFiles::PlaneDataDir(AliMpStationType station, + AliMpPlaneType plane) const { // Returns path to data files with sector description // for a specified plane. @@ -85,10 +91,10 @@ TString AliMpFiles::PlaneDataDir(AliMpPlaneType plane) const switch (plane) { case kBendingPlane: - return fTop + fgkDataDir + fgkBendingDir; + return fTop + fgkDataDir + StationDataDir(station) + fgkBendingDir; ;; case kNonBendingPlane: - return fTop + fgkDataDir + fgkNonBendingDir; + return fTop + fgkDataDir + StationDataDir(station) + fgkNonBendingDir; ;; } @@ -96,6 +102,26 @@ TString AliMpFiles::PlaneDataDir(AliMpPlaneType plane) const return TString(); } +//______________________________________________________________________________ +TString AliMpFiles::StationDataDir(AliMpStationType station) const +{ +// Returns the station directory name for the specified station number. +// --- + + TString stationDataDir(fgkStationDir); + switch (station) { + case kStation1: + stationDataDir += 1; + break; + ;; + case kStation2: + stationDataDir += 2; + break; + ;; + } + return stationDataDir; +} + // // public methods // @@ -114,60 +140,79 @@ AliMpFiles* AliMpFiles::Instance() } //______________________________________________________________________________ -TString AliMpFiles::SectorFilePath(AliMpPlaneType plane) const +TString AliMpFiles::SectorFilePath(AliMpStationType station, + AliMpPlaneType plane) const { // Returns path to data file with sector description. // --- - return TString(PlaneDataDir(plane) + fgkSector + fgkDataExt); + return TString(PlaneDataDir(station, plane) + fgkSector + fgkDataExt); +} + +//______________________________________________________________________________ +TString AliMpFiles::SectorSpecialFilePath(AliMpStationType station, + AliMpPlaneType plane) const +{ +// Returns path to data file with sector special description (irregular motifs). +// --- + + return TString(PlaneDataDir(station, plane) + fgkSectorSpecial + fgkDataExt); } //______________________________________________________________________________ -TString AliMpFiles::SectorSpecialFilePath(AliMpPlaneType plane) const +TString AliMpFiles::SectorSpecialFilePath2(AliMpStationType station, + AliMpPlaneType plane) const { // Returns path to data file with sector special description (irregular motifs). // --- - return TString(PlaneDataDir(plane) + fgkSectorSpecial + fgkDataExt); + return TString(PlaneDataDir(station, plane) + fgkSectorSpecial2 + fgkDataExt); } //______________________________________________________________________________ -TString AliMpFiles::MotifFilePath(AliMpPlaneType plane, +TString AliMpFiles::MotifFilePath(AliMpStationType station, + AliMpPlaneType plane, const TString& motifTypeID) const { // Returns path to data file for a given motif type. // --- - return TString(PlaneDataDir(plane) + fgkMotifPrefix + motifTypeID + fgkDataExt); + return TString(PlaneDataDir(station, plane) + + fgkMotifPrefix + motifTypeID + fgkDataExt); } //______________________________________________________________________________ -TString AliMpFiles::PadPosFilePath(AliMpPlaneType plane, +TString AliMpFiles::PadPosFilePath(AliMpStationType station, + AliMpPlaneType plane, const TString& motifTypeID) const { // Returns path to data file with pad positions for a given motif type. // --- - return TString(PlaneDataDir(plane) + fgkPadPosPrefix + motifTypeID + fgkDataExt); + return TString(PlaneDataDir(station, plane) + + fgkPadPosPrefix + motifTypeID + fgkDataExt); } //______________________________________________________________________________ -TString AliMpFiles::MotifSpecialFilePath(AliMpPlaneType plane, +TString AliMpFiles::MotifSpecialFilePath(AliMpStationType station, + AliMpPlaneType plane, const TString& motifID) const { // Returns path to data file with pad dimensions for a given motif ID. // --- - return TString(PlaneDataDir(plane) + fgkMotifSpecialPrefix + motifID + fgkDataExt); + return TString(PlaneDataDir(station, plane) + + fgkMotifSpecialPrefix + motifID + fgkDataExt); } //______________________________________________________________________________ -TString AliMpFiles::BergToGCFilePath() const +TString AliMpFiles::BergToGCFilePath(AliMpStationType station) const { // Returns the path of the file which describes the correspondance between // the berg number and the gassiplex channel. // --- - return fTop+fgkDataDir+fgkBergToGCFileName+fgkDataExt; + return fTop + fgkDataDir + StationDataDir(station) + + fgkBergToGCFileName + fgkDataExt; } diff --git a/MUON/mapping/AliMpFiles.h b/MUON/mapping/AliMpFiles.h index 5aacc301c61..eee07df80e4 100755 --- a/MUON/mapping/AliMpFiles.h +++ b/MUON/mapping/AliMpFiles.h @@ -11,12 +11,13 @@ // // Authors: David Guez, Ivana Hrivnacova; IPN Orsay -#ifndef M_FILES_H -#define M_FILES_H +#ifndef ALI_MP_FILES_H +#define ALI_MP_FILES_H #include #include +#include "AliMpStationType.h" #include "AliMpPlaneType.h" class AliMpFiles : public TObject @@ -31,15 +32,19 @@ class AliMpFiles : public TObject static AliMpFiles* Instance(); // methods - TString SectorFilePath(AliMpPlaneType plane) const; - TString SectorSpecialFilePath(AliMpPlaneType plane) const; - TString MotifFilePath(AliMpPlaneType plane, + TString SectorFilePath(AliMpStationType station, + AliMpPlaneType plane) const; + TString SectorSpecialFilePath(AliMpStationType station, + AliMpPlaneType plane) const; + TString SectorSpecialFilePath2(AliMpStationType station, + AliMpPlaneType plane) const; + TString MotifFilePath(AliMpStationType station, AliMpPlaneType plane, const TString& motifTypeID) const; - TString MotifSpecialFilePath(AliMpPlaneType plane, - const TString& motifID) const; - TString PadPosFilePath(AliMpPlaneType plane, - const TString& motifTypeID) const; - TString BergToGCFilePath() const; + TString MotifSpecialFilePath(AliMpStationType station, + AliMpPlaneType plane, const TString& motifID) const; + TString PadPosFilePath(AliMpStationType station, + AliMpPlaneType plane, const TString& motifTypeID) const; + TString BergToGCFilePath(AliMpStationType station) const; // set methods void SetTopPath(const TString& topPath); @@ -52,20 +57,23 @@ class AliMpFiles : public TObject private: // methods - TString PlaneDataDir(AliMpPlaneType plane) const; + TString PlaneDataDir(AliMpStationType station, AliMpPlaneType plane) const; + TString StationDataDir(AliMpStationType station) const; // static data members - static AliMpFiles* fgInstance; //this instance - static const TString fgkDefaultTop; //top directory path (default) - static const TString fgkDataDir; //data directory - static const TString fgkBendingDir; //bending plane directory - static const TString fgkNonBendingDir;//non-bending plane directory - static const TString fgkSector; //sector data file name - static const TString fgkSectorSpecial;//sector special data file name - static const TString fgkMotifPrefix; //motif data file name + static AliMpFiles* fgInstance; //this instance + static const TString fgkDefaultTop; //top directory path (default) + static const TString fgkDataDir; //data directory + static const TString fgkStationDir; //station directory + static const TString fgkBendingDir; //bending plane directory + static const TString fgkNonBendingDir; //non-bending plane directory + static const TString fgkSector; //sector data file name + static const TString fgkSectorSpecial; //sector special data file name + static const TString fgkSectorSpecial2;//sector special data file name + static const TString fgkMotifPrefix; //motif data file name static const TString fgkMotifSpecialPrefix; //special motif data file name - static const TString fgkPadPosPrefix; //pad position data file name - static const TString fgkDataExt; //file extension + static const TString fgkPadPosPrefix; //pad position data file name + static const TString fgkDataExt; //file extension static const TString fgkBergToGCFileName; //name of the file with BergToGC mapping // data members @@ -80,4 +88,4 @@ class AliMpFiles : public TObject inline void AliMpFiles::SetTopPath(const TString& topPath) { fTop = topPath; } -#endif //M_FILES_H +#endif //ALI_MP_FILES_H -- 2.43.0