MCH: Added Processing of Digits and Preclusters

Modules/MUON/MCH/CMakeLists.txt

@@ -7,17 +7,23 @@ set(SRCS
   src/Decoding.cxx
   src/GlobalHistogram.cxx
   src/PedestalsTask.cxx
-  src/PhysicsTask.cxx
+  src/PhysicsTaskDigits.cxx
+  src/PhysicsTaskPreclusters.cxx
   src/PedestalsCheck.cxx
+  src/PhysicsCheck.cxx
+  src/TH1MCHReductor.cxx
 )
 
 set(HEADERS
   include/MCH/Mapping.h
   include/MCH/Decoding.h
   include/MCH/GlobalHistogram.h
   include/MCH/PedestalsTask.h
-  include/MCH/PhysicsTask.h
+  include/MCH/PhysicsTaskDigits.h
+  include/MCH/PhysicsTaskPreclusters.h
   include/MCH/PedestalsCheck.h
+  include/MCH/PhysicsCheck.h
+  include/MCH/TH1MCHReductor.h
 )
 
 # ---- Library ----
@@ -31,7 +37,7 @@ target_include_directories(
 )
 
 target_link_libraries(${MODULE_NAME} PUBLIC QualityControl O2::CommonDataFormat O2::GPUCommon 
-        $<TARGET_NAME_IF_EXISTS:O2::MCHMappingFactory> O2::MCHMappingImpl3 O2::MCHMappingSegContour)
+        $<TARGET_NAME_IF_EXISTS:O2::MCHMappingFactory> O2::MCHMappingImpl3 O2::MCHMappingSegContour O2::MCHRawDecoder O2::MCHPreClustering)
 
 target_compile_definitions(${MODULE_NAME} PRIVATE $<$<TARGET_EXISTS:O2::MCHMappingFactory>:MCH_HAS_MAPPING_FACTORY>)
 
@@ -49,8 +55,11 @@ add_root_dictionary(${MODULE_NAME}
                             include/MCH/Decoding.h
                             include/MCH/GlobalHistogram.h
                             include/MCH/PedestalsTask.h
-                            include/MCH/PhysicsTask.h
+                            include/MCH/PhysicsTaskDigits.h
+                            include/MCH/PhysicsTaskPreclusters.h
+                            include/MCH/PhysicsCheck.h
                             include/MCH/PedestalsCheck.h
+                            include/MCH/TH1MCHReductor.h
                             include/MCH/sampa_header.h
                     LINKDEF include/MCH/LinkDef.h)
 

Modules/MUON/MCH/include/MCH/Decoding.h

@@ -37,6 +37,7 @@ struct SampaHit {
   uint32_t size, time;
   std::vector<uint16_t> samples;
   uint64_t csum;
+  int32_t delta;
   MapPad pad;
 };
 
@@ -49,14 +50,15 @@ struct DualSampa {
   int nsyn2Bits;                   // Nb of words waiting synchronization
   Sampa::SampaHeaderStruct header; // current channel header
   unsigned long bxc[2];
-  uint32_t csize, ctime, cid, sample;
+  int32_t csize, ctime, cid, sample;
   int chan_addr[2];
   uint64_t packetsize;
   int nbHit;         // incremented each time a header packet is received for this card
   int nbHitChan[64]; // incremented each time a header packet for a given packet is received for this card
   int ndata[2][32];
   int nclus[2][32];
   double pedestal[2][32], noise[2][32];
+  int32_t min[2][32], max[2][32], delta[2][32];
   SampaHit hit;
 };
 
@@ -85,13 +87,30 @@ class Decoder
   std::vector<o2::mch::Digit>& getDigits() { return mDigits; }
   void reset();
 
-  int32_t getMapCRU(int cruid, int linkid) { return mMapCRU.getLink(cruid, linkid); }
+  int32_t getMapCRU(int cruid, int linkid)
+  {
+    return mMapCRU.getLink(cruid, linkid);
+  }
+
+  bool getMapCRUInv(int32_t link_id, int32_t& cruid, int32_t& crulink)
+  {
+    return mMapCRU.getLinkInv(link_id, cruid, crulink);
+  }
+
   int32_t getMapFEC(uint32_t link_id, uint32_t ds_addr, uint32_t& de, uint32_t& dsid)
   {
     if (!mMapFEC.getDSMapping(link_id, ds_addr, de, dsid))
       return -1;
     return de;
   }
+
+  int32_t getMapFECinv(uint32_t de, uint32_t dsid, uint32_t& link_id, uint32_t& ds_addr)
+  {
+    if (!mMapFEC.getDSMappingInv(de, dsid, link_id, ds_addr))
+      return -1;
+    return link_id;
+  }
+
   MapFEC& getMapFEC() { return mMapFEC; }
 
  private:

Modules/MUON/MCH/include/MCH/GlobalHistogram.h

@@ -34,8 +34,11 @@ class GlobalHistogram : public TH2F
   // add the histograms of the individual detection elements
   void add(std::map<int, TH2F*>& histB, std::map<int, TH2F*>& histNB);
 
+  // replace the contents with the histograms of the individual detection elements, including null bins
+  void set_includeNull(std::map<int, TH2F*>& histB, std::map<int, TH2F*>& histNB);
+
   // replace the contents with the histograms of the individual detection elements
-  void set(std::map<int, TH2F*>& histB, std::map<int, TH2F*>& histNB, bool doAverage = true);
+  void set(std::map<int, TH2F*>& histB, std::map<int, TH2F*>& histNB, bool doAverage = true, bool includeNullBins = false);
 };
 
 } // namespace muonchambers

Modules/MUON/MCH/include/MCH/LinkDef.h

@@ -6,6 +6,9 @@
 //#pragma link C++ class o2::quality_control_modules::muonchambers::Decoder+;
 //#pragma link C++ class o2::quality_control_modules::muonchambers::MuonChambersMapping+;
 #pragma link C++ class o2::quality_control_modules::muonchambers::PedestalsTask + ;
-#pragma link C++ class o2::quality_control_modules::muonchambers::PhysicsTask + ;
+#pragma link C++ class o2::quality_control_modules::muonchambers::PhysicsTaskDigits + ;
+#pragma link C++ class o2::quality_control_modules::muonchambers::PhysicsTaskPreclusters + ;
 #pragma link C++ class o2::quality_control_modules::muonchambers::PedestalsCheck + ;
+#pragma link C++ class o2::quality_control_modules::muonchambers::PhysicsCheck + ;
+#pragma link C++ class o2::quality_control_modules::muonchambers::TH1MCHReductor + ;
 #endif

Modules/MUON/MCH/include/MCH/Mapping.h

@@ -11,6 +11,7 @@
 #include "QualityControl/TaskInterface.h"
 
 #define MCH_DE_MAX 2000
+#define MCH_DSID_MAX 2047
 #define MCH_MAX_CRU_ID 31
 #define MCH_MAX_CRU_IN_FLP 31
 #define LINKID_MAX 0x7FF
@@ -33,6 +34,16 @@ class MapSolar
   ~MapSolar();
 };
 
+class MapSolarInv
+{
+ public:
+  int mCruId;   // CRU ID
+  int mCruLink; // CRU link
+
+  MapSolarInv();
+  ~MapSolarInv();
+};
+
 class MapDualSampa
 {
  public:
@@ -44,6 +55,16 @@ class MapDualSampa
   ~MapDualSampa();
 };
 
+class MapDualSampaInv
+{
+ public:
+  int mLink;    // detector element
+  int mAddress; // DS index
+
+  MapDualSampaInv();
+  ~MapDualSampaInv();
+};
+
 class MapPad
 {
  public:
@@ -67,24 +88,28 @@ class MapCRU
 {
 
   MapSolar mSolarMap[MCH_MAX_CRU_IN_FLP][24];
+  MapSolarInv mSolarMapInv[LINKID_MAX + 1];
 
  public:
   MapCRU();
   bool readMapping(std::string mapFile);
   int32_t getLink(int32_t c, int32_t l);
+  bool getLinkInv(uint32_t link_id, int32_t& c, int32_t& l);
 };
 
 class MapFEC
 {
 
   MapDualSampa mDsMap[LINKID_MAX + 1][40];
+  MapDualSampaInv mDsMapInv[MCH_DE_MAX + 1][MCH_DSID_MAX + 1];
 
  public:
   MapFEC();
   bool readDSMapping(std::string mapFile);
   bool getDSMapping(uint32_t link_id, uint32_t ds_addr, uint32_t& de, uint32_t& dsid);
+  bool getDSMappingInv(uint32_t de, uint32_t dsid, uint32_t& link_id, uint32_t& ds_addr);
   bool getPadByLinkID(uint32_t link_id, uint32_t ds_addr, uint32_t dsch, MapPad& pad);
-  bool getPadByDE(uint32_t de, uint32_t dsis, uint32_t dsch, MapPad& pad);
+  bool getPadByDE(uint32_t de, uint32_t dsid, uint32_t dsch, MapPad& pad);
 };
 
 } // namespace muonchambers

Modules/MUON/MCH/include/MCH/PhysicsCheck.h

@@ -0,0 +1,53 @@
+// Copyright CERN and copyright holders of ALICE O2. This software is
+// distributed under the terms of the GNU General Public License v3 (GPL
+// Version 3), copied verbatim in the file "COPYING".
+//
+// See http://alice-o2.web.cern.ch/license for full licensing information.
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+///
+/// \file   PhysicsCheck.h
+/// \author Andrea Ferrero, Sebastien Perrin
+///
+
+#ifndef QC_MODULE_MCH_PHYSICSCHECK_H
+#define QC_MODULE_MCH_PHYSICSCHECK_H
+
+#include "QualityControl/CheckInterface.h"
+#include "QualityControl/MonitorObject.h"
+#include "QualityControl/Quality.h"
+#include <string>
+
+namespace o2::quality_control_modules::muonchambers
+{
+
+/// \brief  Check if the occupancy on each pad is between the two specified values
+///
+/// \author Andrea Ferrero, Sebastien Perrin
+class PhysicsCheck : public o2::quality_control::checker::CheckInterface
+{
+ public:
+  /// Default constructor
+  PhysicsCheck();
+  /// Destructor
+  ~PhysicsCheck() override;
+
+  // Override interface
+  void configure(std::string name) override;
+  Quality check(std::map<std::string, std::shared_ptr<MonitorObject>>* moMap) override;
+  void beautify(std::shared_ptr<MonitorObject> mo, Quality checkResult = Quality::Null) override;
+  std::string getAcceptedType() override;
+
+ private:
+  int mPrintLevel;
+  double minOccupancy;
+  double maxOccupancy;
+  ClassDefOverride(PhysicsCheck, 1);
+};
+
+} // namespace o2::quality_control_modules::muonchambers
+
+#endif // QC_MODULE_TOF_TOFCHECKRAWSTIME_H