Changeset 20096 for trunk

Timestamp:

05/07/21 12:37:39 (3 years ago)

Author:

tbretz

Message:

root 6.24 requires some more includes, clasng 10 is a bit more picky about overload warinings and casting, gErrorMutex i deprecated -> so we can only lock our error handler again ourselves... well... mess ahead... thank you.

Location:

trunk/Mars

Files:

• mbase/MLog.cc (modified) (4 diffs)
• mcamera/MCameraDC.cc (modified) (1 diff)
• mhbase/MH3.cc (modified) (1 diff)
• mhcalib/MHCalibrationChargeBlindPix.cc (modified) (1 diff)
• mhflux/MHAlpha.cc (modified) (1 diff)
• mhflux/MHFalseSource.cc (modified) (1 diff)

trunk/Mars/mbase/MLog.cc

@@ -99 +99 @@
 #include <iomanip>
 
+#if ROOT_VERSION_CODE >= ROOT_VERSION(6,24,00)
+#include <mutex>
+#endif
+
+
 #include <TROOT.h>      // gROOT->GetListOfCleanups()
 #include <TSystem.h>
@@ -150 +155 @@
 MLog gLog;
 
+/// Serializes error output, destructed by the gROOT destructor via ReleaseDefaultErrorHandler()
+ static std::mutex *GetErrorMutex() {
+    static std::mutex *m = new std::mutex();
+    return m;
+ }
+ 
 // --------------------------------------------------------------------------
 //
@@ -760 +771 @@
     // if abort is set it aborts the application.
    if (gErrorIgnoreLevel == kUnset) {
-      R__LOCKGUARD2(gErrorMutex);
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,24,00)
+       R__LOCKGUARD2(gErrorMutex);
+#else
+       std::lock_guard<std::mutex> guard(*GetErrorMutex());
+#endif
 
       gErrorIgnoreLevel = 0;
@@ -789 +804 @@
 void MLog::ErrorHandlerPrint(Int_t level, const char *location, const char *msg)
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(6,24,00)
     R__LOCKGUARD2(gErrorMutex);
+#else
+    std::lock_guard<std::mutex> guard(*GetErrorMutex());
+#endif
 
     if (level >= kError)

trunk/Mars/mcamera/MCameraDC.cc

@@ -106 +106 @@
 Float_t MCameraDC::GetMin() const
 {
-    Float_t val = (UInt_t)-1;
+    Float_t val = std::numeric_limits<Float_t>::max();
     for (int i=0; i<fArray.GetSize(); i++)
         val = TMath::Min(val, GetCurrent(i));

trunk/Mars/mhbase/MH3.cc

@@ -918 +918 @@
             return kTRUE;
         case kLabelsX:
-            static_cast<TProfile2D*>(fHist)->Fill(labelx, y,      z);
+            static_cast<TProfile2D*>(fHist)->Fill(labelx, y,      z, 1.);
             return kTRUE;
         case kLabelsY:
-            static_cast<TProfile2D*>(fHist)->Fill(x,      labely, z);
+            static_cast<TProfile2D*>(fHist)->Fill(x,      labely, z, 1.);
             return kTRUE;
         case kLabelsXY:
-            static_cast<TProfile2D*>(fHist)->Fill(labelx, labely, z);
+            static_cast<TProfile2D*>(fHist)->Fill(labelx, labely, z, 1.);
             return kTRUE;
         }

trunk/Mars/mhcalib/MHCalibrationChargeBlindPix.cc

@@ -81 +81 @@
 #include <TH2D.h>
 #include <TRandom.h>
+#include <TLine.h> // root 6.24
 
 #include "MLog.h"

trunk/Mars/mhflux/MHAlpha.cc

@@ -50 +50 @@
 #include <TCanvas.h>
 #include <TPaveStats.h>
+#include <TLine.h> // root 6.24
 
 #include "MHillas.h"

trunk/Mars/mhflux/MHFalseSource.cc

@@ -127 +127 @@
 #include <TPaveText.h>
 #include <TStopwatch.h>
+#include <TLine.h> // root 6.24
 
 #include "MGeomCam.h"