Take the official equipment ids from AliDAQ class (Christian)

diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx
index 09a9d24bbada841e522f1d5b18fc1738319087a4..1983241be03944859b2a67ff40d0f974af31b695 100644 (file)
--- a/MUON/AliMUONRawStreamTracker.cxx
+++ b/MUON/AliMUONRawStreamTracker.cxx
@@ -32,6 +32,7 @@
 
 #include "AliRawReader.h"
 #include "AliRawDataHeader.h"
+#include "AliDAQ.h"
 #include "AliLog.h"
 
 #include "AliMpBusPatch.h"
@@ -193,7 +194,7 @@ Bool_t AliMUONRawStreamTracker::NextDDL()
   AliDebug(3, Form("DDL Number %d\n", fDDL ));
 
   fRawReader->Reset();
-  fRawReader->Select(0X9, fDDL, fDDL);  //Select the DDL file to be read  
+  fRawReader->Select(AliDAQ::DetectorID("MUONTRK"), fDDL, fDDL);  //Select the DDL file to be read  
 
   fRawReader->ReadHeader();
 

diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx
index db675c64db1ad0a96097af7dd1b62ea76a10889a..77b6867df81eeb782b4131acfb10414227bdbaca 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.cxx
+++ b/MUON/AliMUONRawStreamTrigger.cxx
@@ -32,6 +32,7 @@
 
 #include "AliRawReader.h"
 #include "AliRawDataHeader.h"
+#include "AliDAQ.h"
 #include "AliLog.h"
 
 
@@ -145,8 +146,9 @@ Bool_t AliMUONRawStreamTrigger::NextDDL()
     fDDL = 0;
     return kFALSE;
   }
+
   fRawReader->Reset();
-  fRawReader->Select(0XA,fDDL,fDDL);  //Select the DDL file to be read  
+  fRawReader->Select(AliDAQ::DetectorID("MUONTRG"),fDDL,fDDL);  //Select the DDL file to be read  
 
   fRawReader->ReadHeader();
 

diff --git a/MUON/AliMUONRawWriter.cxx b/MUON/AliMUONRawWriter.cxx
index 858b1c7a8a5987c686fb0421c76f6d68da202043..74b86d1510d704b4153affb0fe32bc3cf68e7995 100644 (file)
--- a/MUON/AliMUONRawWriter.cxx
+++ b/MUON/AliMUONRawWriter.cxx
@@ -40,6 +40,7 @@
 
 #include "AliBitPacking.h" 
 #include "AliRawReader.h"
+#include "AliDAQ.h"
 #include "AliLog.h"
 #include "AliMUON.h"
 #include "AliMUONConstants.h"
@@ -221,11 +222,11 @@ Int_t AliMUONRawWriter::Digits2Raw()
   for (Int_t ich = 0; ich < AliMUONConstants::NTrackingCh(); ich++) 
   {
     // open files
-    idDDL = ich * 2  + 0x900; // official number for MUON
+    idDDL = ich * 2  + AliDAQ::DdlIDOffset("MUONTRK");
     sprintf(name, "MUON_%d.ddl",idDDL);
     fFile[0] = fopen(name,"w");
 
-    idDDL = (ich * 2) + 1 + 0x900;
+    idDDL = (ich * 2) + 1 + AliDAQ::DdlIDOffset("MUONTRK");
     sprintf(name, "MUON_%d.ddl",idDDL);
     fFile[1] = fopen(name,"w");
     
@@ -239,11 +240,11 @@ Int_t AliMUONRawWriter::Digits2Raw()
   // trigger chambers
  
   // open files
-  idDDL = 0xA00;// official number for MUTR
+  idDDL = AliDAQ::DdlIDOffset("MUONTRG");
   sprintf(name, "MUTR_%d.ddl",idDDL);
   fFile[0] = fopen(name,"w");
 
-  idDDL = 0xA00 + 1;
+  idDDL = AliDAQ::DdlIDOffset("MUONTRG") + 1;
   sprintf(name, "MUTR_%d.ddl",idDDL);
   fFile[1] = fopen(name,"w");