cosmetics for some logs

Author: sy-c

src/ReadoutEquipment.cxx

@@ -925,7 +925,7 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
       RdhHandle h(baseAddress + pageOffset);
       rdhIndexInPage++;
 
-      // printf("RDH #%d @ 0x%X : next block @ +%d bytes\n",rdhIndexInPage,(unsigned int)pageOffset,h.getOffsetNextPacket());
+      // printf("RDH %d @ 0x%X : next block @ +%d bytes\n",rdhIndexInPage,(unsigned int)pageOffset,h.getOffsetNextPacket());
 
       if (h.validateRdh(errorDescription)) {
         if ((cfgRdhDumpEnabled) || (cfgRdhDumpErrorEnabled)) {
@@ -939,7 +939,7 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
         }
         statsRdhCheckErr++;
 	isPageError = 1;
-        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : invalid RDH: %s", id, rdhIndexInPage, (unsigned int)pageOffset, errorDescription.c_str());
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH %d @ 0x%X : invalid RDH: %s", id, rdhIndexInPage, (unsigned int)pageOffset, errorDescription.c_str());
         // stop on first RDH error (should distinguich valid/invalid block length)
         break;
       } else {
@@ -960,7 +960,7 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
       }
       if (linkId != h.getLinkId()) {
         if (cfgRdhDumpWarningEnabled) {
-          theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : inconsistent link ids: %d != %d", id, rdhIndexInPage, (unsigned int)pageOffset, linkId, h.getLinkId());
+          theLog.log(logRdhErrorsToken, "Equipment %d RDH %d @ 0x%X : inconsistent link ids: %d != %d", id, rdhIndexInPage, (unsigned int)pageOffset, linkId, h.getLinkId());
           isPageError = 1;
         }
         statsRdhCheckStreamErr++;
@@ -982,7 +982,7 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
       if ((isDefinedLastDetectorField[linkId])&&(pageOffset)) {
         if (checkChangesInDetectorField(h, pageOffset)) {
 	   if (cfgRdhDumpWarningEnabled) {
-             theLog.log(logRdhErrorsToken, "Equipment %d Link %d RDH #%d @ 0x%X : detector field changed not at page beginning", id, (int)blockHeader.linkId, rdhIndexInPage, (unsigned int)pageOffset);
+             theLog.log(logRdhErrorsToken, "Equipment %d Link %d RDH %d @ 0x%X : detector field changed not at page beginning", id, (int)blockHeader.linkId, rdhIndexInPage, (unsigned int)pageOffset);
             isPageError = 1;
           }
           statsRdhCheckStreamErr++;
@@ -1014,7 +1014,7 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
           if (newCount !=
               (uint8_t)(RdhLastPacketCounter[linkId] + (uint8_t)1)) {
             theLog.log(LogDebugTrace,
-                       "RDH #%d @ 0x%X : possible packets dropped for link %d, packetCounter jump from %d to %d",
+                       "RDH %d @ 0x%X : possible packets dropped for link %d, packetCounter jump from %d to %d",
                        rdhIndexInPage, (unsigned int)pageOffset,
                        (int)linkId, (int)RdhLastPacketCounter[linkId],
                        (int)newCount);
@@ -1031,23 +1031,23 @@ int ReadoutEquipment::processRdh(DataBlockContainerReference& block)
 
         // provision for further checks on superpage size
         /*
-        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : offsetNextPacket is null", id, rdhIndexInPage, (unsigned int)pageOffset);
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH %d @ 0x%X : offsetNextPacket is null", id, rdhIndexInPage, (unsigned int)pageOffset);
         statsRdhCheckErr++;
         isPageError = 1;
         break;
       }
       if ((pageOffset + h.getMemorySize() == blockSize)&&(pageOffset + offsetNextPacket == blockSize)) {
         // this is normal end of page: the last packet fills the end of the page
-        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : end packet size ok: offsetNextpacket = %d bytes, memorySize = %d bytes, page = %d bytes", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)h.getMemorySize(),  (int)blockSize);
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH %d @ 0x%X : end packet size ok: offsetNextpacket = %d bytes, memorySize = %d bytes, page = %d bytes", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)h.getMemorySize(),  (int)blockSize);
         break;
       }
       if ((pageOffset + offsetNextPacket == blockSize)||(pageOffset + h.getMemorySize() == blockSize)) {
-        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : end packet size mismatch: offsetNextpacket = %d bytes, memorySize = %d bytes, page = %d bytes", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)h.getMemorySize(),  (int)blockSize);
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH %d @ 0x%X : end packet size mismatch: offsetNextpacket = %d bytes, memorySize = %d bytes, page = %d bytes", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)h.getMemorySize(),  (int)blockSize);
         // this is normal end of page: the last packet fills the end of the page
         break;
       }
       if (pageOffset + offsetNextPacket > blockSize) {
-        theLog.log(logRdhErrorsToken, "Equipment %d RDH #%d @ 0x%X : next packet (+ %d bytes) is outside of page (%d bytes)", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)blockSize);
+        theLog.log(logRdhErrorsToken, "Equipment %d RDH %d @ 0x%X : next packet (+ %d bytes) is outside of page (%d bytes)", id, rdhIndexInPage, (unsigned int)pageOffset, (int)offsetNextPacket, (int)blockSize);
         statsRdhCheckErr++;
         isPageError = 1;
         */