Merge branch '21.0-trig-prescale-mon-new' into '21.0'

21.0 trig prescale mon new

See merge request atlas/athena!12015

Former-commit-id: f84cfe310fafa4919cd3f75e45edb29d1b7c809a

DataQuality/dqm_algorithms/dqm_algorithms/BinHeightThreshold.h

@@ -17,16 +17,21 @@ namespace dqm_algorithms
 	struct BinHeightThreshold : public dqm_core::Algorithm
         {
 	  enum binStatus {aRedBin,aYellowBin,aGreenBin,anUndefBin=-1};
-	  BinHeightThreshold();
+	  BinHeightThreshold(const std::string & name);
 
 	    //overwrites virtual functions
 	  BinHeightThreshold * clone( );
 	  dqm_core::Result * execute( const std::string & , const TObject & , const dqm_core::AlgorithmConfig & );
-          BinHeightThreshold::binStatus CompareBinHeightThreshold(double bincontent, double thresholdGr, double thresholdRed);
+	  void CheckThresholds(const std::string & type, double thresholdGr, double thresholdRed);
+	  bool checkUndefinedStatusValue(const std::string & type,double thresholdGr, double thresholdRed,std::pair<bool,double> valueGray);
+          BinHeightThreshold::binStatus CompareBinHeightThreshold(const std::string & type, double bincontent, double thresholdGr, double thresholdRed,std::pair<bool,double> valueGray);
+	  bool equalWithinPrecision(double a,double b);
           using dqm_core::Algorithm::printDescription;
 	  void  printDescription(std::ostream& out);
  
 	  private:
+	  std::string name_;
+	  double precision_;
 	};
 }
 

DataQuality/dqm_algorithms/dqm_algorithms/BinHeight_Equal_Threshold.h

+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*! \file BinHeight_Equal_Threshold.h file declares the dqm_algorithms::BinHeight_Equal_Threshold  class.
+ * \author Margherita Spalla, following what's done in BinsGreaterThanThreshold.h
+*/
+
+#ifndef DQM_ALGORITHMS_BINHEIGHT_EQUAL_THRESHOLD_H
+#define DQM_ALGORITHMS_BINHEIGHT_EQUAL_THRESHOLD_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_algorithms/BinHeightThreshold.h>
+
+namespace dqm_algorithms
+{
+	struct BinHeight_Equal_Threshold : public BinHeightThreshold
+        {
+	  BinHeight_Equal_Threshold(): BinHeightThreshold("Equal") {};
+
+	};
+}
+
+#endif // DQM_ALGORITHMS_BINHEIGHT_EQUAL_THRESHOLD_H

DataQuality/dqm_algorithms/dqm_algorithms/BinHeight_GreaterThanEqual_Threshold.h

+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*! \file BinHeight_GreaterThanEqual_Threshold.h file declares the dqm_algorithms::BinHeight_GreaterThanEqual_Threshold  class.
+ * \author Margherita Spalla, following what's done in BinsGreaterThanThreshold.h
+*/
+
+#ifndef DQM_ALGORITHMS_BINHEIGHT_GREATERTHANEQUAL_THRESHOLD_H
+#define DQM_ALGORITHMS_BINHEIGHT_GREATERTHANEQUAL_THRESHOLD_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_algorithms/BinHeightThreshold.h>
+
+namespace dqm_algorithms
+{
+	struct BinHeight_GreaterThanEqual_Threshold : public BinHeightThreshold
+        {
+	  BinHeight_GreaterThanEqual_Threshold(): BinHeightThreshold("GreaterThanEqual") {};
+
+	};
+}
+
+#endif // DQM_ALGORITHMS_BINHEIGHT_GREATERTHANEQUAL_THRESHOLD_H

DataQuality/dqm_algorithms/dqm_algorithms/BinHeight_GreaterThan_Threshold.h

+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*! \file BinHeight_GreaterThan_Threshold.h file declares the dqm_algorithms::BinHeight_GreaterThan_Threshold  class.
+ * \author Margherita Spalla, following what's done in BinsGreaterThanThreshold.h
+*/
+
+#ifndef DQM_ALGORITHMS_BINHEIGHT_GREATERTHAN_THRESHOLD_H
+#define DQM_ALGORITHMS_BINHEIGHT_GREATERTHAN_THRESHOLD_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_algorithms/BinHeightThreshold.h>
+
+namespace dqm_algorithms
+{
+	struct BinHeight_GreaterThan_Threshold : public BinHeightThreshold
+        {
+	  BinHeight_GreaterThan_Threshold(): BinHeightThreshold("GreaterThan") {};
+
+	};
+}
+
+#endif // DQM_ALGORITHMS_BINHEIGHT_GREATERTHAN_THRESHOLD_H

DataQuality/dqm_algorithms/dqm_algorithms/BinHeight_LessThanEqual_Threshold.h

+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*! \file BinHeight_LessThanEqual_Threshold.h file declares the dqm_algorithms::BinHeight_LessThanEqual_Threshold  class.
+ * \author Margherita Spalla, following what's done in BinsGreaterThanThreshold.h
+*/
+
+#ifndef DQM_ALGORITHMS_BINHEIGHT_LESSTHANEQUAL_THRESHOLD_H
+#define DQM_ALGORITHMS_BINHEIGHT_LESSTHANEQUAL_THRESHOLD_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_algorithms/BinHeightThreshold.h>
+
+namespace dqm_algorithms
+{
+	struct BinHeight_LessThanEqual_Threshold : public BinHeightThreshold
+        {
+	  BinHeight_LessThanEqual_Threshold(): BinHeightThreshold("LessThanEqual") {};
+
+	};
+}
+
+#endif // DQM_ALGORITHMS_BINHEIGHT_LESSTHANEQUAL_THRESHOLD_H

DataQuality/dqm_algorithms/dqm_algorithms/BinHeight_LessThan_Threshold.h

+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*! \file BinHeight_LessThan_Threshold.h file declares the dqm_algorithms::BinHeight_LessThan_Threshold  class.
+ * \author Margherita Spalla, following what's done in BinsGreaterThanThreshold.h
+*/
+
+#ifndef DQM_ALGORITHMS_BINHEIGHT_LESSTHAN_THRESHOLD_H
+#define DQM_ALGORITHMS_BINHEIGHT_LESSTHAN_THRESHOLD_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_algorithms/BinHeightThreshold.h>
+
+namespace dqm_algorithms
+{
+	struct BinHeight_LessThan_Threshold : public BinHeightThreshold
+        {
+	  BinHeight_LessThan_Threshold(): BinHeightThreshold("LessThan") {};
+
+	};
+}
+
+#endif // DQM_ALGORITHMS_BINHEIGHT_LESSTHAN_THRESHOLD_H

DataQuality/dqm_algorithms/dqm_algorithms/BinHeight_redEqual_yellowGreaterThan_Threshold.h

+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*! \file BinHeight_redEqual_yellowGreaterThan_Threshold.h file declares the dqm_algorithms::BinHeight_redEqual_yellowGreaterThan_Threshold  class.
+ * \author Margherita Spalla, following what's done in BinsGreaterThanThreshold.h
+*/
+
+#ifndef DQM_ALGORITHMS_BINHEIGHT_REDEQ_YELLOWGT_THRESHOLD_H
+#define DQM_ALGORITHMS_BINHEIGHT_REDEQ_YELLOWGT_THRESHOLD_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_algorithms/BinHeightThreshold.h>
+
+namespace dqm_algorithms
+{
+	struct BinHeight_redEqual_yellowGreaterThan_Threshold : public BinHeightThreshold
+        {
+	  BinHeight_redEqual_yellowGreaterThan_Threshold(): BinHeightThreshold("redEqual_yellowGreaterThan") {};
+
+	};
+}
+
+#endif // DQM_ALGORITHMS_BINHEIGHT_REDEQ_YELLOWGT_THRESHOLD_H

DataQuality/dqm_algorithms/dqm_algorithms/BinHeight_redEqual_yellowLessThan_Threshold.h

+/*
+  Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
+*/
+
+/*! \file BinHeight_redEqual_yellowLessThan_Threshold.h file declares the dqm_algorithms::BinHeight_redEqual_yellowLessThan_Threshold  class.
+ * \author Margherita Spalla, following what's done in BinsGreaterThanThreshold.h
+*/
+
+#ifndef DQM_ALGORITHMS_BINHEIGHT_REDEQ_YELLOWLT_THRESHOLD_H
+#define DQM_ALGORITHMS_BINHEIGHT_REDEQ_YELLOWLT_THRESHOLD_H
+
+#include <dqm_core/Algorithm.h>
+#include <dqm_algorithms/BinHeightThreshold.h>
+
+namespace dqm_algorithms
+{
+	struct BinHeight_redEqual_yellowLessThan_Threshold : public BinHeightThreshold
+        {
+	  BinHeight_redEqual_yellowLessThan_Threshold(): BinHeightThreshold("redEqual_yellowLessThan") {};
+
+	};
+}
+
+#endif // DQM_ALGORITHMS_BINHEIGHT_REDEQ_YELLOWLT_THRESHOLD_H

DataQuality/dqm_algorithms/dqm_algorithms/dqm_algorithmsDict.h

@@ -31,6 +31,13 @@
 #include "dqm_algorithms/BinThresh.h"
 #include "dqm_algorithms/BinThreshold.h"
 #include "dqm_algorithms/BinHeightThreshold.h"
+#include "dqm_algorithms/BinHeight_GreaterThan_Threshold.h"
+#include "dqm_algorithms/BinHeight_GreaterThanEqual_Threshold.h"
+#include "dqm_algorithms/BinHeight_LessThan_Threshold.h"
+#include "dqm_algorithms/BinHeight_LessThanEqual_Threshold.h"
+#include "dqm_algorithms/BinHeight_redEqual_yellowGreaterThan_Threshold.h"
+#include "dqm_algorithms/BinHeight_redEqual_yellowLessThan_Threshold.h"
+#include "dqm_algorithms/BinHeight_Equal_Threshold.h"
 #include "dqm_algorithms/BinsDiffByStrips.h"
 #include "dqm_algorithms/BinsDiffFromStripMedian.h"
 #include "dqm_algorithms/BinsDiffFromStripMedianOnline.h"

DataQuality/dqm_algorithms/dqm_algorithms/selection.xml

@@ -26,6 +26,13 @@
   <class name="dqm_algorithms::BinThresh"/>
   <class name="dqm_algorithms::BinThreshold"/>
   <class name="dqm_algorithms::BinHeightThreshold"/>
+  <class name="dqm_algorithms::BinHeight_GreaterThan_Threshold"/>
+  <class name="dqm_algorithms::BinHeight_GreaterThanEqual_Threshold"/>
+  <class name="dqm_algorithms::BinHeight_LessThan_Threshold"/>
+  <class name="dqm_algorithms::BinHeight_LessThanEqual_Threshold"/>
+  <class name="dqm_algorithms::BinHeight_redEqual_yellowGreaterThan_Threshold"/>
+  <class name="dqm_algorithms::BinHeight_redEqual_yellowLessThan_Threshold"/>
+  <class name="dqm_algorithms::BinHeight_Equal_Threshold"/>
   <class name="dqm_algorithms::BinsDiffByStrips"/>
   <class name="dqm_algorithms::BinsDiffFromStripMedian"/>
   <class name="dqm_algorithms::BinsDiffFromStripMedianOnline"/>