Adding DDL corruption recovery option to dHLTdumpraw and making modifications require...

diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx
index ac296e6d21ab94739097d29dcb81c099f66000c6..20e5122ea3a92fd6d0b46a2c50a07744feabe58e 100644 (file)
--- a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx
+++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.cxx
@@ -271,7 +271,7 @@ void AliHLTMUONHitReconstructor::TryRecover(ERecoveryMode mode)
 
 
 bool AliHLTMUONHitReconstructor::Run(
-               const AliHLTUInt32_t* rawData,
+               AliHLTUInt32_t* rawData,
                AliHLTUInt32_t rawDataSize,
                AliHLTMUONRecHitStruct* const recHit,
                AliHLTUInt32_t& nofHit
@@ -369,7 +369,7 @@ bool AliHLTMUONHitReconstructor::FillChannelData(
 }
 
 
-bool AliHLTMUONHitReconstructor::DecodeDDL(const AliHLTUInt32_t* rawData,AliHLTUInt32_t rawDataSize)
+bool AliHLTMUONHitReconstructor::DecodeDDL(AliHLTUInt32_t* rawData,AliHLTUInt32_t rawDataSize)
 {
   //function to decode Raw Data 
 

diff --git a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.h b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.h
index f84e5b8a2c4e5994679f5975bcb5b62159379608..626092038b001ff8506b6e33f6b1283e6d4bdd00 100644 (file)
--- a/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.h
+++ b/HLT/MUON/OnlineAnalysis/AliHLTMUONHitReconstructor.h
@@ -49,7 +49,7 @@ public:
        AliHLTInt32_t GetDCCut() const { return fDCCut; }
        
        bool Run(
-                       const AliHLTUInt32_t* rawData,
+                       AliHLTUInt32_t* rawData,
                        AliHLTUInt32_t rawDataSize,
                        AliHLTMUONRecHitStruct* const recHit,
                        AliHLTUInt32_t& nofHit
@@ -338,7 +338,7 @@ private:
        
        ERecoveryMode fRecoveryMode;  ///< The recovery mode for the decoder.
        
-       bool DecodeDDL(const AliHLTUInt32_t* rawData, AliHLTUInt32_t rawDataSize);
+       bool DecodeDDL(AliHLTUInt32_t* rawData, AliHLTUInt32_t rawDataSize);
        void FindCentralHits(AliHLTInt32_t iDet);
        bool FindRecHits();
        void RecXRecY();

diff --git a/HLT/MUON/utils/dHLTdumpraw.cxx b/HLT/MUON/utils/dHLTdumpraw.cxx
index 97442c47f323b5dfcf36f1710ff5602458fe9f52..31e0ed1a968fd195fd49d9885f26c19f573ce633 100644 (file)
--- a/HLT/MUON/utils/dHLTdumpraw.cxx
+++ b/HLT/MUON/utils/dHLTdumpraw.cxx
@@ -1168,14 +1168,13 @@ int DumpRawDataHeader(
 
 
 int DumpTrackerDDLRawStream(
-               const char* buffer, unsigned long bufferSize,
-               bool continueParse
+               char* buffer, unsigned long bufferSize,
+               bool continueParse, bool tryrecover
        )
 {
        // Dumps a tracker DDL raw stream data.
        
-       const AliRawDataHeader* header =
-               reinterpret_cast<const AliRawDataHeader*>(buffer);
+       AliRawDataHeader* header = reinterpret_cast<AliRawDataHeader*>(buffer);
        int result = DumpRawDataHeader(buffer, bufferSize, header, continueParse);
        if (result != EXIT_SUCCESS) return result;
 
@@ -1183,10 +1182,10 @@ int DumpTrackerDDLRawStream(
        AliMUONTrackerDDLDecoder<AliTrackerDecoderHandler> decoder;
        decoder.ExitOnError(not continueParse);
        decoder.SendDataOnParityError(true);
-       decoder.TryRecover(false);
+       decoder.TryRecover(tryrecover);
        decoder.AutoDetectTrailer(true);
        decoder.CheckForTrailer(true);
-       const char* payload = buffer + sizeof(AliRawDataHeader);
+       char* payload = buffer + sizeof(AliRawDataHeader);
        UInt_t payloadSize = bufferSize - sizeof(AliRawDataHeader);
        if (decoder.Decode(payload, payloadSize))
        {
@@ -1201,7 +1200,7 @@ int DumpTrackerDDLRawStream(
 
 int DumpTriggerDDLRawStream(
                const char* buffer, unsigned long bufferSize,
-               bool continueParse
+               bool continueParse, bool tryrecover
        )
 {
        // Dumps a trigger DDL raw stream data.
@@ -1214,7 +1213,7 @@ int DumpTriggerDDLRawStream(
        
        AliMUONTriggerDDLDecoder<AliTriggerDecoderHandler> decoder;
        decoder.ExitOnError(not continueParse);
-       decoder.TryRecover(false);
+       decoder.TryRecover(tryrecover);
        decoder.AutoDetectScalars(false);
        const char* payload = buffer + sizeof(AliRawDataHeader);
        UInt_t payloadSize = bufferSize - sizeof(AliRawDataHeader);
@@ -2348,6 +2347,8 @@ int CheckIfDDLStream(const char* buffer, unsigned long bufferSize)
  * [in] \param bufferSize  The size of the buffer in bytes.
  * [in] \param continueParse  If specified then the we try to continue parsing the
  *           buffer as much as possible.
+ * [in] \param tryrecover Indicates if the DDL decoders should have special
+ *           recovery logic enabled.
  * [in/out] \param type  Initialy this should indicate the type of the data block
  *           or kUnknownDataBlock if not known. On exit it will be filled with
  *           the type of the data block as discovered by this routine if type
@@ -2356,8 +2357,8 @@ int CheckIfDDLStream(const char* buffer, unsigned long bufferSize)
  *           on success.
  */
 int ParseBuffer(
-               const char* buffer, unsigned long bufferSize,
-               bool continueParse, int& type
+               char* buffer, unsigned long bufferSize,
+               bool continueParse, bool tryrecover, int& type
        )
 {
        assert( buffer != NULL );
@@ -2433,11 +2434,11 @@ int ParseBuffer(
        switch (type)
        {
        case kTrackerDDLRawData:
-               subResult = DumpTrackerDDLRawStream(buffer, bufferSize, continueParse);
+               subResult = DumpTrackerDDLRawStream(buffer, bufferSize, continueParse, tryrecover);
                if (subResult != EXIT_SUCCESS) result = subResult;
                break;
        case kTriggerDDLRawData:
-               subResult = DumpTriggerDDLRawStream(buffer, bufferSize, continueParse);
+               subResult = DumpTriggerDDLRawStream(buffer, bufferSize, continueParse, tryrecover);
                if (subResult != EXIT_SUCCESS) result = subResult;
                break;
        case kTriggerRecordsDataBlock:
@@ -2740,6 +2741,9 @@ void PrintUsage(bool asError = true)
        os << " -continue | -c" << endl;
        os << "       If specified, the program will try to continue parsing the data block" << endl;
        os << "       as much as possible rather than stopping at the first error." << endl;
+       os << " -recover | -e" << endl;
+       os << "       If specified, special DDL decoder recovery logic is enabled to handle" << endl;
+       os << "       corrupt DDL data." << endl;
        os << " -type | -t <typename>" << endl;
        os << "       Forces the contents of the subsequent files specified on the command" << endl;
        os << "       line to be interpreted as a specific type of data block." << endl;
@@ -2786,6 +2790,7 @@ void PrintUsage(bool asError = true)
  *                    and added to 'filenames'.
  * @param continueParse  Set to true if the user requested to continue to parse
  *                      after errors.
+ * @param tryrecover Set to true if the user wants DDL decoder recovery logic enabled.
  * @param checkData  Set to true if data integrity checking was requested.
  * @param maxLogging  Set to true if maximal logging was requested.
  * @return  A status flag suitable for returning from main(), containing either
@@ -2799,12 +2804,14 @@ int ParseCommandLine(
                const char** dataspecs,
                int& numOfFiles,
                bool& continueParse,
+               bool& tryrecover,
                bool& checkData,
                bool& maxLogging
        )
 {
        numOfFiles = 0;
        continueParse = false;
+       tryrecover = false;
        maxLogging = false;
        checkData = false;
        int currentType = kUnknownDataBlock;
@@ -2824,6 +2831,10 @@ int ParseCommandLine(
                {
                        continueParse = true;
                }
+               else if (strcmp(argv[i], "-recover") == 0 or strcmp(argv[i], "-e") == 0)
+               {
+                       tryrecover = true;
+               }
                else if (strcmp(argv[i], "-type") == 0 or strcmp(argv[i], "-t") == 0)
                {
                        if (++i >= argc)
@@ -2987,6 +2998,7 @@ int main(int argc, const char** argv)
 
        int numOfFiles = 0;
        bool continueParse = false;
+       bool tryrecover = false;
        bool checkData = false;
        bool maxLogging = false;
        int returnCode = EXIT_SUCCESS;
@@ -3009,7 +3021,7 @@ int main(int argc, const char** argv)
                
                returnCode = ParseCommandLine(
                                argc, argv, filename, filetype, dataspec, numOfFiles,
-                               continueParse, checkData, maxLogging
+                               continueParse, tryrecover, checkData, maxLogging
                        );
 
                if (returnCode == EXIT_SUCCESS)
@@ -3024,7 +3036,7 @@ int main(int argc, const char** argv)
                                        cout << "########## Start of dump for file: "
                                                << filename[i] << " ##########" << endl;
                                }
-                               int result = ParseBuffer(buffer, bufferSize, continueParse, filetype[i]);
+                               int result = ParseBuffer(buffer, bufferSize, continueParse, tryrecover, filetype[i]);
                                if (buffer != NULL) delete [] buffer;
                                if (result != EXIT_SUCCESS)
                                {