TRD fix pid in mc to raw

bazinski · davidrohr · commit b37cbcff9ac7 · 2022-07-08T11:01:58.000+02:00
diff --git a/DataFormats/Detectors/TRD/include/DataFormatsTRD/RawData.h b/DataFormats/Detectors/TRD/include/DataFormatsTRD/RawData.h
@@ -192,7 +192,7 @@ struct TrackletMCMData {
     struct {
       uint8_t checkbit : 1; //
       uint16_t slope : 8;   // Deflection angle of tracklet
-      uint16_t pid : 12;    // Particle Identity 7 bits of Q0 and 5 bits of Q1
+      uint16_t pid : 12;    // Particle Identity 6 bits of Q0 and 6 bits of Q1
       uint16_t pos : 11;    // Position of tracklet, signed 11 bits, granularity 1/80 pad widths, -12.80 to +12.80, relative to centre of pad 10
     } __attribute__((__packed__));
   };
diff --git a/DataFormats/Detectors/TRD/src/RawData.cxx b/DataFormats/Detectors/TRD/src/RawData.cxx
@@ -278,20 +278,16 @@ void constructTrackletMCMData(TrackletMCMData& trackletword, const int format, c
   trackletword.word = 0;
   // create a tracklet word as it would be sent from the FEE
   // slope and position have the 8-th bit flipped each
-  trackletword.word = 0;
   trackletword.slope = slope ^ 0x80;
   trackletword.pos = pos ^ 0x80;
   trackletword.checkbit = 0;
   if (format & 0x1) {
-    //length of q1 and q2 are 6 with a 2 bit offset.
-    //What happens when q2 and q1 dont share the same offset (upper 2 bits ?) ?
-    LOG(error) << "This tracklet format has not been tested yet";
-    trackletword.pid = (q0 & 0x3f) & ((q1 & 0x1) << 6);
-    //TODO check the 2 bit offset is still valid ... ??
+    //length of q1 and q2 are 6 with a 2 bit offset sitting in the header.
+    trackletword.pid = (q0 & 0x3f) | ((q1 & 0x3f) << 6);
   } else {
-    trackletword.pid = (q0 & 0x3f) & ((q1 & 0x1) << 6);
+    //q2 sits with upper 1 bit of q1 in the header pid word, hence the 0x3f so 6 bits of q1 are used here, shifted up above the 6 bits of q0.
+    trackletword.pid = (int)(q0 & 0x3f) | ((q1 & 0x3f) << 6);
   }
-  //q2 sits with upper 2 bits of q1 in the header pid word, hence the 0x1f so 5 bits are used here.
 }
 
 void constructTrackletMCMData(TrackletMCMData& trackletword, const Tracklet64& tracklet)
@@ -319,7 +315,7 @@ void printTrackletHCHeader(o2::trd::TrackletHCHeader& halfchamber)
 
 void printTrackletMCMData(o2::trd::TrackletMCMData& tracklet)
 {
-  LOGF(info, "TrackletMCMData: Raw:0x%08x pos:%d slope:%d pid:0x%08x checkbit:0x%02x",
+  LOGF(info, "TrackletMCMData: Raw:0x%08x pos:%d slope:%d pid:0x%03x checkbit:0x%02x",
        tracklet.word, tracklet.pos, tracklet.slope, tracklet.pid, tracklet.checkbit);
 }
 void printTrackletMCMHeader(o2::trd::TrackletMCMHeader& mcmhead)
diff --git a/Detectors/TRD/simulation/src/Trap2CRU.cxx b/Detectors/TRD/simulation/src/Trap2CRU.cxx
@@ -495,7 +495,7 @@ int Trap2CRU::buildTrackletRawData(const int trackletindex, const int linkid)
   while (linkid == HelperMethods::getLinkIDfromHCID(mTracklets[trackletindex + trackletcounter].getHCID()) && header.col == mTracklets[trackletindex + trackletcounter].getColumn() && header.padrow == mTracklets[trackletindex + trackletcounter].getPadRow()) {
     int trackletoffset = trackletindex + trackletcounter;
     constructTrackletMCMData(trackletdata[trackletcounter], mTracklets[trackletoffset]);
-    unsigned int headerqpart = ((mTracklets[trackletoffset].getQ2() & 0x2f) << 2) + ((mTracklets[trackletoffset].getQ1() >> 6) & 0x3);
+    unsigned int headerqpart = ((mTracklets[trackletoffset].getQ2() & 0x7f) << 1) + ((mTracklets[trackletoffset].getQ1() >> 6) & 0x3);
     //all 6 bits of Q1 and 2 upper bits of 7bit Q1
     if (mVerbosity) {
       if (mTracklets[trackletoffset].getQ2() > 0x3f) {
@@ -539,13 +539,15 @@ int Trap2CRU::buildTrackletRawData(const int trackletindex, const int linkid)
     setNumberOfTrackletsInHeader(header, trackletcounter);
     if (trackletcounter > 0) { // dont write header if there are no tracklets.
       if (mVerbosity) {
-        LOG(info) << " TTT TrackletMCMHeader : 0x" << std::hex << header;
+        LOG(info) << " TTT TrackletMCMHeader : 0x" << std::hex << header << " pid : " << header.pid0 << " pid1: " << header.pid1;
+        printTrackletMCMHeader(header);
       }
       memcpy((char*)mRawDataPtr, (char*)&header, sizeof(TrackletMCMHeader));
       mRawDataPtr += sizeof(TrackletMCMHeader);
       for (int i = 0; i < trackletcounter; ++i) {
         if (mVerbosity) {
           LOG(info) << " TTTx TrackletMCMData : 0x" << std::hex << trackletdata[i];
+          printTrackletMCMData(trackletdata[i]);
         }
         memcpy((char*)mRawDataPtr, (char*)&trackletdata[i], sizeof(TrackletMCMData));
         mRawDataPtr += sizeof(TrackletMCMData);
