Merge pull request #1 from aphecetche/preclustering-test

[MCH] From vector to span in dataDecoderSpec
pillot · Mar 25, 2020 · 61ce931 · 61ce931
2 parents 6b1049e + d846a68
commit 61ce931
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Detectors/MUON/MCH/Raw/Tools/.clang-format b/Detectors/MUON/MCH/Raw/Tools/.clang-format
@@ -0,0 +1,3 @@
+DisableFormat: true
+SortIncludes: false
+
diff --git a/Detectors/MUON/MCH/Raw/Tools/DataDecoderSpec.cxx b/Detectors/MUON/MCH/Raw/Tools/DataDecoderSpec.cxx
@@ -81,7 +81,8 @@ class DataDecoderTask
       //std::cout<<"raw:     "<<(void*)raw<<std::endl;
       //std::cout<<"payload: "<<(void*)payload<<std::endl;
 
-      std::vector<uint8_t> buffer((uint8_t*)raw, ((uint8_t*)raw)+payloadSize+sizeof(o2::header::RAWDataHeaderV4));
+     //  std::vector<uint8_t> buffer((uint8_t*)raw, ((uint8_t*)raw)+payloadSize+sizeof(o2::header::RAWDataHeaderV4));
+      gsl::span<uint8_t> buffer(const_cast<uint8_t*>(reinterpret_cast<const uint8_t*>(raw)), payloadSize+sizeof(o2::header::RAWDataHeaderV4));
       decoder.decodeBuffer(buffer, digits);
     }
 

diff --git a/Detectors/MUON/MCH/Raw/Tools/RawBufferDecoder.h b/Detectors/MUON/MCH/Raw/Tools/RawBufferDecoder.h
@@ -76,10 +76,9 @@ class RawBufferDecoder
     cruLink2solar = o2::mch::raw::createCruLink2SolarMapper<ElectronicMapperGenerated>();
   }
 
-  void decodeBuffer(std::vector<uint8_t> &buffer, std::vector<o2::mch::Digit> &digits)
+  void decodeBuffer(gsl::span<uint8_t> sbuffer, std::vector<o2::mch::Digit> &digits)
   {
     //bool verbose = false;
-    gsl::span<uint8_t> sbuffer(buffer);
 
     size_t ndigits{0};