Coding conventions

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpTriggerReader.cxx

diff --git a/MUON/mapping/AliMpTriggerReader.cxx b/MUON/mapping/AliMpTriggerReader.cxx
index bfc7cd109152ec4a3e4b5aec698c723767a8efff..a7d433a93a7d9cc19450668765efc1c398f60493 100644 (file)
--- a/MUON/mapping/AliMpTriggerReader.cxx
+++ b/MUON/mapping/AliMpTriggerReader.cxx
@@ -16,31 +16,31 @@
 // $Id$
 // $MpId: AliMpTriggerReader.cxx,v 1.4 2006/05/24 13:58:52 ivana Exp $
 
-#include <cstdlib>
 #include "AliMpTriggerReader.h"
-#include "AliMpMotifReader.h"
-#include "AliMpFiles.h"
+
+#include "AliLog.h"
+#include "AliMpConstants.h"
 #include "AliMpDataStreams.h"
+#include "AliMpFiles.h"
+#include "AliMpHelper.h"
+#include "AliMpMotif.h"
+#include "AliMpMotifPosition.h"
+#include "AliMpMotifReader.h"
+#include "AliMpMotifSpecial.h"
 #include "AliMpMotifType.h"
 #include "AliMpPCB.h"
 #include "AliMpSlat.h"
 #include "AliMpSlatMotifMap.h"
-#include "AliMpMotifSpecial.h"
-#include "AliMpMotifPosition.h"
-#include "AliMpMotif.h"
-#include "AliMpHelper.h"
+#include "AliMpSlatMotifMap.h"
 #include "AliMpSt345Reader.h"
 #include "AliMpTrigger.h"
-#include "AliMpConstants.h"
-
-#include "AliLog.h"
-
 #include "Riostream.h"
 #include "TClass.h"
-#include "TObjString.h"
 #include "TList.h"
+#include "TObjString.h"
 #include "TString.h"
 #include <TArrayI.h>
+#include <cstdlib>
 #include <sstream>
 
 //-----------------------------------------------------------------------------
@@ -64,10 +64,10 @@ const TString AliMpTriggerReader::fgkKeywordFlipX("FLIP_X");
 const TString AliMpTriggerReader::fgkKeywordFlipY("FLIP_Y");
 
 //_____________________________________________________________________________
-AliMpTriggerReader::AliMpTriggerReader(const AliMpDataStreams& dataStreams) 
+AliMpTriggerReader::AliMpTriggerReader(const AliMpDataStreams& dataStreams, AliMpSlatMotifMap* motifMap) 
 : TObject(),
-  fDataStreams(dataStreams),
-  fMotifMap(AliMpSlatMotifMap::Instance()),
+  fkDataStreams(dataStreams),
+  fMotifMap(motifMap),
   fLocalBoardMap()
 {
   ///
@@ -468,7 +468,7 @@ AliMpTriggerReader::ReadLines(const char* slatType,
                        srcLine,destLine));
   
   istream& in 
-    = fDataStreams.
+    = fkDataStreams.
         CreateDataStream(AliMpFiles::SlatFilePath(
                              AliMp::kStationTrigger,slatType, planeType));
   
@@ -546,7 +546,7 @@ AliMpTriggerReader::ReadLocalBoardMapping()
   UShort_t mask;
   
   istream& in 
-    = fDataStreams.
+    = fkDataStreams.
         CreateDataStream(AliMpFiles::LocalTriggerBoardMapping());
 
   char line[80];
@@ -611,12 +611,12 @@ AliMpTriggerReader::ReadPCB(const char* pcbType)
   }
   
   istream& in 
-    = fDataStreams.
+    = fkDataStreams.
         CreateDataStream(AliMpFiles::SlatPCBFilePath(
                              AliMp::kStationTrigger,pcbName));
  
-  AliMpMotifReader reader(fDataStreams,
-                          AliMp::kStationTrigger,AliMp::kNonBendingPlane); 
+  AliMpMotifReader reader(fkDataStreams,
+                          AliMp::kStationTrigger, AliMq::kNotSt12, AliMp::kNonBendingPlane); 
   // note that the nonbending
   // parameter is of no use for trigger, as far as reading motif is 
   // concerned, as all motifs are supposed to be in the same directory