Added the writing of the trigger DDL raw data. New raw data header class for simulati...

diff --git a/STEER/AliSimulation.cxx b/STEER/AliSimulation.cxx
index 0978849a5e86baefb9f7f04f6772f120cc598921..b76b96bd802176529f0a2d32dd524f3d9152e634 100644 (file)
--- a/STEER/AliSimulation.cxx
+++ b/STEER/AliSimulation.cxx
@@ -127,6 +127,7 @@
 #include "AliSimulation.h"
 #include "AliVertexGenFile.h"
 #include "AliCentralTrigger.h"
+#include "AliCTPRawData.h"
 
 ClassImp(AliSimulation)
 
@@ -662,7 +663,17 @@ Bool_t AliSimulation::RunTrigger(const char* descriptors)
    return kTRUE;
 }
 
+//_____________________________________________________________________________
+Bool_t AliSimulation::WriteTriggerRawData()
+{
+  // Writes the CTP (trigger) DDL raw data
+  // Details of the format are given in the
+  // trigger TDR - pages 134 and 135.
+  AliCTPRawData writer;
+  writer.RawData();
 
+  return kTRUE;
+}
 
 //_____________________________________________________________________________
 Bool_t AliSimulation::RunSimulation(Int_t nEvents)
@@ -1024,6 +1035,9 @@ Bool_t AliSimulation::WriteRawFiles(const char* detectors)
       }
     }
 
+    if (!WriteTriggerRawData())
+      if (fStopOnError) return kFALSE;
+
     gSystem->ChangeDirectory(baseDir);
     if ((detStr.CompareTo("ALL") != 0) && !detStr.IsNull()) {
       AliError(Form("the following detectors were not found: %s", 

diff --git a/STEER/AliSimulation.h b/STEER/AliSimulation.h
index fa271f3d72604c0e68e734ecec4528377a902e27..7ffe015338ed7799b68f838d60e8cd046d4158f7 100644 (file)
--- a/STEER/AliSimulation.h
+++ b/STEER/AliSimulation.h
@@ -91,6 +91,7 @@ public:
   virtual Bool_t RunSimulation(Int_t nEvents = 0);
   virtual Bool_t RunSDigitization(const char* detectors = "ALL");
   virtual Bool_t RunTrigger(const char* descriptors ="" );
+  virtual Bool_t WriteTriggerRawData();
   virtual Bool_t RunDigitization(const char* detectors = "ALL",
                                 const char* excludeDetectors = "");
   virtual Bool_t RunHitsDigitization(const char* detectors = "ALL");

diff --git a/STEER/STEERLinkDef.h b/STEER/STEERLinkDef.h
index 20f0806ea912f7d91d837194d2651d95205d0524..9ed6e3b199e70a01812b1e9498694941a29387e3 100644 (file)
--- a/STEER/STEERLinkDef.h
+++ b/STEER/STEERLinkDef.h
@@ -129,5 +129,6 @@
 #pragma link C++ class AliTriggerCondition+;
 #pragma link C++ class AliTriggerDescriptor+;
 #pragma link C++ class AliCentralTrigger+;
+#pragma link C++ class AliCTPRawData+;
 
 #endif

diff --git a/STEER/libSTEER.pkg b/STEER/libSTEER.pkg
index 3de0250deda98dfbc02bdda8058eb8327fe80ce6..a6f336e767fcd99dd07eac84143ee6e75715c6a7 100644 (file)
--- a/STEER/libSTEER.pkg
+++ b/STEER/libSTEER.pkg
@@ -32,7 +32,8 @@ AliCentralTrigger.cxx AliRieman.cxx\
 AliTrackFitter.cxx AliTrackFitterRieman.cxx AliTrackFitterStraight.cxx\
 AliTrackResiduals.cxx AliTrackResidualsChi2.cxx AliTrackResidualsFast.cxx\
 AliAlignmentTracks.cxx \
-AliExpression.cxx
+AliExpression.cxx \
+AliCTPRawData.cxx
 
 HDRS:= $(SRCS:.cxx=.h) 
 
@@ -43,5 +44,5 @@ EINCLUDE:=$(ALICE)/geant3/TGeant3 RAW
 EINCLUDE+= TPC
 #endif
 
-EXPORT:=$(SRCS:.cxx=.h) AliConst.h AliCallf77.h
+EXPORT:=$(SRCS:.cxx=.h) AliConst.h AliCallf77.h AliRawDataHeaderSim.h