Address ITS stuck-pixel review comments

Author: jryu

DataFormats/Detectors/ITSMFT/common/src/ITSMFTDataFormatsLinkDef.h

@@ -23,6 +23,7 @@
 #pragma link C++ class o2::itsmft::Digit + ;
 #pragma link C++ class o2::itsmft::NoiseMap + ;
 #pragma link C++ class o2::itsmft::TimeDeadMap + ;
+#pragma link C++ class o2::itsmft::StuckPixelData + ;
 #pragma link C++ class std::vector < o2::itsmft::Digit> + ;
 
 #pragma link C++ class o2::itsmft::GBTCalibData + ;

Detectors/ITSMFT/common/workflow/include/ITSMFTWorkflow/DeadMapBuilderSpec.h

@@ -43,6 +43,7 @@
 
 #include <ITSMFTReconstruction/RawPixelDecoder.h> //o2::itsmft::RawPixelDecoder
 #include "DataFormatsITSMFT/TimeDeadMap.h"
+#include "DataFormatsITSMFT/StuckPixelData.h"
 #include "DetectorsCalibration/Utils.h"
 #include "DetectorsCommonDataFormats/FileMetaData.h"
 #include "DetectorsBase/GRPGeomHelper.h"
@@ -132,19 +133,19 @@ class ITSMFTDeadMapBuilder : public Task
 
   // Flag to avoid that endOfStream and stop are both done
   bool isEnded = false;
-<<<<<<< HEAD
-=======
 
+  // Stuck pixel related members
+  bool mDoStuckPixels = false;
   std::string mStuckPixelFileName = "";
+  o2::itsmft::StuckPixelData mStuckPixelData;
 
-  TTree* mErrorTree = nullptr; 
   Long64_t mErrOrbit = 0;  
   UShort_t mErrChipID = 0;        
   UShort_t mErrRow = 0;           
   UShort_t mErrCol = 0;
->>>>>>> 5df4d36ff6 (Add ITS stuck-pixel CCDB object output)
+
 };
-6
+
 // Create a processor spec
 o2::framework::DataProcessorSpec getITSMFTDeadMapBuilderSpec(std::string datasource, bool doMFT);