Merge branch 'AliceO2Group:dev' into fd3_digits

Author: pkurash

CCDB/include/CCDB/BasicCCDBManager.h

@@ -20,6 +20,8 @@
 #include "CommonUtils/NameConf.h"
 #include "Framework/DataTakingContext.h"
 #include "Framework/DefaultsHelpers.h"
+#include "Framework/ServiceRegistryRef.h"
+#include "Framework/DataProcessingStats.h"
 #include <string>
 #include <chrono>
 #include <map>
@@ -340,6 +342,13 @@ T* CCDBManagerInstance::getForTimeStamp(std::string const& path, long timestamp,
   }
   auto end = std::chrono::system_clock::now();
   mTimerMS += std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
+  auto *ref = o2::framework::ServiceRegistryRef::globalDeviceRef();
+  if (ref && ref->active<framework::DataProcessingStats>()) {
+    auto& stats = ref->get<o2::framework::DataProcessingStats>();
+    stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_HIT, o2::framework::DataProcessingStats::Op::Set, (int64_t)mQueries - mFailures - mFetches});
+    stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_MISS, o2::framework::DataProcessingStats::Op::Set, (int64_t)mFetches});
+    stats.updateStats({(int)o2::framework::ProcessingStatsId::CCDB_CACHE_FAILURE, o2::framework::DataProcessingStats::Op::Set, (int64_t)mFailures});
+  }
   return ptr;
 }
 
@@ -391,4 +400,4 @@ class BasicCCDBManager : public CCDBManagerInstance
 
 } // namespace o2::ccdb
 
-#endif //O2_BASICCCDBMANAGER_H
+#endif // O2_BASICCCDBMANAGER_H

CCDB/src/BasicCCDBManager.cxx

@@ -13,6 +13,8 @@
 // Created by Sandro Wenzel on 2019-08-14.
 //
 #include "CCDB/BasicCCDBManager.h"
+#include "Framework/ServiceRegistryRef.h"
+#include "Framework/DataProcessingStats.h"
 #include <boost/lexical_cast.hpp>
 #include <fairlogger/Logger.h>
 #include <string>

Common/DCAFitter/include/DCAFitter/DCAFitterN.h

@@ -818,6 +818,7 @@ GPUd() o2::math_utils::SMatrix<double, 3, 3, o2::math_utils::MatRepSym<double, 3
   MatSym3D covmSum;
   for (int i = N; i--;) {
     MatSym3D covTr = o2::math_utils::Similarity(getTrackRotMatrix(i), getTrackCovMatrix(i, cand));
+    covmSum += covTr;
   }
   return covmSum;
 }

Common/SimConfig/include/SimConfig/G4Params.h

@@ -33,13 +33,22 @@ enum class EG4Physics {
   kUSER = 8                           /* allows to give own string combination */
 };
 
+// enumerating possible geometry navigation modes
+// (understanding that geometry description is always done with TGeo)
+enum class EG4Nav {
+  kTGeo = 0, /* navigate with TGeo */
+  kG4 = 1    /* navigate with G4 native geometry */
+};
+
 // parameters to influence the G4 engine
 struct G4Params : public o2::conf::ConfigurableParamHelper<G4Params> {
   EG4Physics physicsmode = EG4Physics::kFTFP_BERT_EMV_optical; // default physics mode with which to configure G4
 
   std::string configMacroFile = ""; // a user provided g4Config.in file (otherwise standard one fill be taken)
   std::string userPhysicsList = ""; // possibility to directly give physics list as string
 
+  EG4Nav navmode = EG4Nav::kTGeo; // geometry navigation mode (default TGeo)
+
   std::string const& getPhysicsConfigString() const;
 
   O2ParamDef(G4Params, "G4");

Common/SimConfig/src/SimConfigLinkDef.h

@@ -29,6 +29,7 @@
 #pragma link C++ class o2::conf::ConfigurableParamHelper < o2::conf::DigiParams> + ;
 
 #pragma link C++ enum o2::conf::EG4Physics;
+#pragma link C++ enum o2::conf::EG4Nav;
 #pragma link C++ enum o2::conf::SimFieldMode;
 #pragma link C++ struct o2::conf::G4Params + ;
 #pragma link C++ class o2::conf::ConfigurableParamHelper < o2::conf::G4Params> + ;

DataFormats/Detectors/CTP/include/DataFormatsCTP/Configuration.h

@@ -214,7 +214,8 @@ struct CtpCfg {
   uint32_t orbitShift = 0;
   uint32_t irInputs_1_24 = 0;
   uint32_t irInputs_25_48 = 0;
-  ClassDefNV(CtpCfg, 1)
+  std::vector<int> listOfUsedInputs();
+  ClassDefNV(CtpCfg, 2)
 };
 } // namespace ctp
 } // namespace o2

DataFormats/Detectors/CTP/src/Configuration.cxx

@@ -1227,9 +1227,24 @@ int CtpCfg::readAndSave(std::string& path)
   }
   return 0;
 }
-
+std::vector<int> CtpCfg::listOfUsedInputs()
+{
+  std::cout << std::hex << "0x" << irInputs_1_24 << " " << irInputs_25_48 << std::dec << std::endl;
+  std::vector<int> inputList;
+  for (int i = 0; i < 24; i++) {
+    if ((1ul << i) & irInputs_1_24) {
+      inputList.push_back(i);
+    }
+  }
+  for (int i = 0; i < 24; i++) {
+    if ((1ul << i) & irInputs_25_48) {
+      inputList.push_back(i + 24);
+    }
+  }
+  return inputList;
+}
 std::ostream& o2::ctp::operator<<(std::ostream& in, const o2::ctp::CTPConfiguration& conf)
 {
   conf.printStream(in);
   return in;
-}
+}

DataFormats/Detectors/EMCAL/include/DataFormatsEMCAL/EMCALChannelData.h

@@ -33,12 +33,52 @@ class CalGain
 
   void setMPVdEdx(int iDet, float mpv) { mMPVdEdx[iDet] = mpv; }
 
-  float getMPVdEdx(int iDet) const { return mMPVdEdx[iDet]; }
+  float getMPVdEdx(int iDet, bool defaultAvg = true) const
+  {
+    // if defaultAvg = false, we take the value stored whatever it is
+    // if defaultAvg = true and we have default value or bad value stored, we take the average on all chambers instead
+    if (!defaultAvg || isGoodGain(iDet))
+      return mMPVdEdx[iDet];
+    else {
+      if (TMath::Abs(mMeanGain + 999.) < 1e-6)
+        mMeanGain = getAverageGain();
+      return mMeanGain;
+    }
+  }
+
+  float getAverageGain() const
+  {
+    float averageGain = 0.;
+    int ngood = 0;
+
+    for (int iDet = 0; iDet < constants::MAXCHAMBER; iDet++) {
+      if (isGoodGain(iDet)) {
+        // The chamber has correct calibration
+        ngood++;
+        averageGain += mMPVdEdx[iDet];
+      }
+    }
+    if (ngood == 0) {
+      // we should make sure it never happens
+      return constants::MPVDEDXDEFAULT;
+    }
+    averageGain /= ngood;
+    return averageGain;
+  }
+
+  bool isGoodGain(int iDet) const
+  {
+    if (TMath::Abs(mMPVdEdx[iDet] - constants::MPVDEDXDEFAULT) > 1e-6)
+      return true;
+    else
+      return false;
+  }
 
  private:
   std::array<float, constants::MAXCHAMBER> mMPVdEdx{}; ///< Most probable value of dEdx distribution per TRD chamber
+  mutable float mMeanGain{-999.};                      ///! average gain, calculated only once
 
-  ClassDefNV(CalGain, 1);
+  ClassDefNV(CalGain, 2);
 };
 
 } // namespace trd