Bug fixed (Christian)

[u/mrichter/AliRoot.git] / RAW / AliDAQ.cxx

diff --git a/RAW/AliDAQ.cxx b/RAW/AliDAQ.cxx
index 1b8d2542c2503b0b6aad86cae730f593221a4bd7..3107f1d27760559dae0793660d3f2a3229474e54 100644 (file)
--- a/RAW/AliDAQ.cxx
+++ b/RAW/AliDAQ.cxx
@@ -179,30 +179,34 @@ Int_t AliDAQ::DdlIDOffset(Int_t detectorID)
   return (detectorID << 8);
 }
 
-const char *AliDAQ::DetectorNameFromDdlID(Int_t ddlID)
+const char *AliDAQ::DetectorNameFromDdlID(Int_t ddlID,Int_t &ddlIndex)
 {
   // Returns the detector name for
   // a given DDL ID
-  Int_t detectorID = DetectorIDFromDdlID(ddlID);
+  ddlIndex = -1;
+  Int_t detectorID = DetectorIDFromDdlID(ddlID,ddlIndex);
   if (detectorID < 0)
     return "";
 
   return DetectorName(detectorID);
 }
 
-Int_t AliDAQ::DetectorIDFromDdlID(Int_t ddlID)
+Int_t AliDAQ::DetectorIDFromDdlID(Int_t ddlID,Int_t &ddlIndex)
 {
-  // Returns the detector ID for
-  // a given DDL ID
+  // Returns the detector ID and
+  // the ddl index within the
+  // detector range for
+  // a given input DDL ID
   Int_t detectorID = ddlID >> 8;
   if (detectorID < 0 || detectorID >= kNDetectors) {
     AliErrorClass(Form("Invalid detector index: %d (%d -> %d) !",detectorID,0,kNDetectors-1));
     return -1;
   }
-  Int_t ddlIndex = ddlID & 0xFF;
+  ddlIndex = ddlID & 0xFF;
   if (ddlIndex >= fgkNumberOfDdls[detectorID]) {
     AliErrorClass(Form("Invalid DDL index %d (%d -> %d) for detector %d",
                       ddlIndex,0,fgkNumberOfDdls[detectorID],detectorID));
+    ddlIndex = -1;
     return -1;
   }
   return detectorID;
@@ -239,6 +243,43 @@ Int_t AliDAQ::DdlID(Int_t detectorID, Int_t ddlIndex)
   return ddlID;
 }
 
+const char *AliDAQ::DdlFileName(const char *detectorName, Int_t ddlIndex)
+{
+  // Returns the DDL file name
+  // (used in the simulation) starting from
+  // the detector name and the DDL
+  // index inside the detector
+  Int_t detectorID = DetectorID(detectorName);
+  if (detectorID < 0)
+    return "";
+
+  return DdlFileName(detectorID,ddlIndex);
+}
+
+const char *AliDAQ::DdlFileName(Int_t detectorID, Int_t ddlIndex)
+{
+  // Returns the DDL file name
+  // (used in the simulation) starting from
+  // the detector ID and the DDL
+  // index inside the detector
+  Int_t ddlID = DdlIDOffset(detectorID);
+  if (ddlID < 0)
+    return "";
+  
+  if (ddlIndex >= fgkNumberOfDdls[detectorID]) {
+    AliErrorClass(Form("Invalid DDL index %d (%d -> %d) for detector %d",
+                      ddlIndex,0,fgkNumberOfDdls[detectorID],detectorID));
+    return "";
+  }
+
+  ddlID += ddlIndex;
+  TString fileName = DetectorName(detectorID);
+  fileName += "_";
+  fileName += ddlID;
+  fileName += ".ddl";
+  return fileName.Data();
+}
+
 Int_t AliDAQ::NumberOfDdls(const char *detectorName)
 {
   // Returns the number of DDLs for