HCALDQM: Monitor bad capid rotation, uHTR/L1T mismatches (10_2_X)

DQM/HcalCommon/interface/Constants.h

@@ -321,26 +321,28 @@ namespace hcaldqm
 		 *	Orbit Gap Operations enum
 		 */
 		uint8_t const EVENTTYPE_PEDESTAL = 1;
-		uint8_t const EVENTTYPE_LASER = 14;
+		uint8_t const EVENTTYPE_LASER    = 14;
+		uint8_t const EVENTTYPE_LED      = 15;
 		enum OrbitGapType
 		{
-			tUnkown = -1,
 			tNull = 0,
 			tPedestal = 1,
-			tHFRaddam = 2,
-			tHBHEHPD = 3,
-			tHO = 4,
-			tHF = 5,
-			tZDC = 6,
-			tHEPMega = 7,
-			tHEMMega = 8,
-			tHBPMega = 9,
-			tHBMMega = 10,
-			tSomething = 11,
-			tCRF = 12,
-			tCalib = 13,
-			tSafe = 14,
-			nOrbitGapType = 15
+			tLED = 2,
+			tHFRaddam = 3,
+			tHBHEHPD = 4,
+			tHO = 5,
+			tHF = 6,
+			tZDC = 7,
+			tHEPMega = 8,
+			tHEMMega = 9,
+			tHBPMega = 10,
+			tHBMMega = 11,
+			tSomething = 12,
+			tCRF = 13,
+			tCalib = 14,
+			tSafe = 15,
+			tUnknown = 16,
+			nOrbitGapType = 17
 		};
 	}
 }

DQM/HcalCommon/interface/Container1D.h

@@ -26,9 +26,6 @@
 
 namespace hcaldqm
 {
-
-	using namespace quantity;
-	using namespace mapper;
 	class Container1D : public Container
 	{
 		public:
@@ -39,8 +36,8 @@ namespace hcaldqm
 			//
 			Container1D(std::string const& folder,
 				hashfunctions::HashType, 
-				Quantity*,
-				Quantity *qy =  new ValueQuantity(quantity::fN));
+				quantity::Quantity*,
+				quantity::Quantity *qy =  new quantity::ValueQuantity(quantity::fN));
 			~Container1D() override;
 
 			//	Initialize Container
@@ -49,15 +46,15 @@ namespace hcaldqm
 			//	@nametitle - namebase of the name and of the title
 			//
 			virtual void initialize(std::string const& folder, 
-				hashfunctions::HashType,  Quantity*,
-				Quantity *qy = new ValueQuantity(quantity::fN), 
+				hashfunctions::HashType,  quantity::Quantity*,
+				quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN), 
 				int debug=0);
 
 			//	@qname - to replace the QyvsQx naming
 			virtual void initialize(std::string const& folder, 
 				std::string const &qname,
-				hashfunctions::HashType,  Quantity*,
-				Quantity *qy = new ValueQuantity(quantity::fN), 
+				hashfunctions::HashType,  quantity::Quantity*,
+				quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN), 
 				int debug=0);
  			using Container::initialize;
 
@@ -323,14 +320,17 @@ namespace hcaldqm
 			//	set lumi flags for all mes
 			virtual void setLumiFlag();
 
+			virtual void showOverflowX(bool showOverflow);
+			virtual void showOverflowY(bool showOverflow);
+
 		protected:
 			virtual void customize(MonitorElement*);
 
 			typedef boost::unordered_map<uint32_t, MonitorElement*> MEMap;
 			MEMap									_mes;
 			mapper::HashMapper						_hashmap;
-			Quantity								*_qx;
-			Quantity								*_qy;
+			quantity::Quantity								*_qx;
+			quantity::Quantity								*_qy;
 	};
 }
 

DQM/HcalCommon/interface/Container2D.h

@@ -22,23 +22,23 @@ namespace hcaldqm
 		public:
 			Container2D();
 			Container2D(std::string const& folder,
-				hashfunctions::HashType, Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fN));
+				hashfunctions::HashType, quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN));
 			~Container2D() override;
 
 			//	Initialize Container
 			//	@folder
 			//	@nametitle, 
 			virtual void initialize(std::string const& folder, 
-					hashfunctions::HashType, Quantity*, Quantity*,
-					Quantity *qz = new ValueQuantity(quantity::fN),
+					hashfunctions::HashType, quantity::Quantity*, quantity::Quantity*,
+					quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
 					int debug=0);
 
 			//	@qname - quantity name replacer
 			virtual void initialize(std::string const& folder, 
 				std::string const& qname,
-				hashfunctions::HashType, Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fN),
+				hashfunctions::HashType, quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
 				int debug=0);
  			using Container::initialize;
  			using Container1D::initialize;
@@ -173,8 +173,10 @@ namespace hcaldqm
 				HcalElectronicsMap const*, filter::HashFilter const&,
 				std::string subsystem="Hcal", std::string aux="") override;
 
+			void showOverflowZ(bool showOverflow);
+
 		protected:
-			Quantity	*_qz;
+			quantity::Quantity	*_qz;
 
 			void customize(MonitorElement*) override;
 	};

DQM/HcalCommon/interface/ContainerD.h

@@ -5,7 +5,6 @@
 
 namespace hcaldqm
 {
-	using namespace constants;
 	class ContainerD : public Container
 	{
 		public:

DQM/HcalCommon/interface/ContainerI.h

@@ -5,7 +5,6 @@
 
 namespace hcaldqm
 {
-	using namespace constants;
 	class ContainerI : public Container
 	{
 		public:

DQM/HcalCommon/interface/ContainerProf1D.h

@@ -18,26 +18,24 @@
 
 namespace hcaldqm
 {
-	using namespace quantity;
-	using namespace mapper;
 	class ContainerProf1D : public Container1D
 	{
 		public:
 			ContainerProf1D();
 			ContainerProf1D(std::string const& folder, 
 				hashfunctions::HashType, 
-				Quantity *, Quantity*);
+				quantity::Quantity *, quantity::Quantity*);
 			~ContainerProf1D() override {}
 
 			void initialize(std::string const& folder, 
 				hashfunctions::HashType, 
-				Quantity*, Quantity*,
+				quantity::Quantity*, quantity::Quantity*,
 				int debug=0) override;
 
 			void initialize(std::string const& folder, 
 				std::string const& qname,
 				hashfunctions::HashType, 
-				Quantity*, Quantity*,
+				quantity::Quantity*, quantity::Quantity*,
 				int debug=0) override;
 
 			//	booking

DQM/HcalCommon/interface/ContainerProf2D.h

@@ -17,28 +17,27 @@
 
 namespace hcaldqm
 {
-	using namespace quantity;
 	class ContainerProf2D : public Container2D
 	{
 		public:
 			ContainerProf2D();
 			ContainerProf2D(std::string const& folder, 
 				hashfunctions::HashType,
-				Quantity*, Quantity*, 
-				Quantity* qz = new ValueQuantity(quantity::fEnergy));
+				quantity::Quantity*, quantity::Quantity*, 
+				quantity::Quantity* qz = new quantity::ValueQuantity(quantity::fEnergy));
 			~ContainerProf2D() override {}
 
 			void initialize(std::string const& folder, 
 				hashfunctions::HashType,
-				Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fEnergy),
+				quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fEnergy),
 				int debug=0) override;
 
 			void initialize(std::string const& folder, 
 				std::string const& qname,
 				hashfunctions::HashType,
-				Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fEnergy),
+				quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fEnergy),
 				int debug=0) override;
 
 			void book(DQMStore::IBooker&,
@@ -54,6 +53,31 @@ namespace hcaldqm
 				HcalElectronicsMap const*, filter::HashFilter const&,
 				std::string subsystem="Hcal", std::string aux="") override;
 
+			void fill(HcalDetId const&) override ;
+			void fill(HcalDetId const&, int) override;
+			void fill(HcalDetId const&, double) override;
+			void fill(HcalDetId const&, int, double) override;
+			void fill(HcalDetId const&, int, int) override;
+			void fill(HcalDetId const&, double, double) override;
+
+			void fill(HcalElectronicsId const&) override;
+			void fill(HcalElectronicsId const&, int) override;
+			void fill(HcalElectronicsId const&, double) override;
+			void fill(HcalElectronicsId const&, int, double) override;
+			void fill(HcalElectronicsId const&, int, int) override;
+			void fill(HcalElectronicsId const&, double, double) override;
+
+			void fill(HcalTrigTowerDetId const&) override;
+			void fill(HcalTrigTowerDetId const&, int) override;
+			void fill(HcalTrigTowerDetId const&, double) override;
+			void fill(HcalTrigTowerDetId const&, int, int) override;
+			void fill(HcalTrigTowerDetId const&, int, double) override;
+			void fill(HcalTrigTowerDetId const&, double, double) override;
+
+			void fill(HcalDetId const&, double, double, double);
+			void fill(HcalElectronicsId const&, double, double, double);
+			void fill(HcalTrigTowerDetId const&, double, double, double);
+
 		protected:
 	};
 }

DQM/HcalCommon/interface/ContainerS.h

@@ -6,7 +6,6 @@
 
 namespace hcaldqm
 {
-	using namespace constants;
 	class ContainerS : public Container
 	{
 		public:

DQM/HcalCommon/interface/ContainerSingle1D.h

@@ -16,30 +16,29 @@
 
 namespace hcaldqm
 {
-	using namespace quantity;
 	class ContainerSingle1D : public Container
 	{
 		public:
 			ContainerSingle1D();
 			ContainerSingle1D(std::string const& folder, 
-				Quantity*,
-				Quantity *qy = new ValueQuantity(quantity::fN));
+				quantity::Quantity*,
+				quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN));
 			ContainerSingle1D(std::string const& folder, 
 				std::string const&,
-				Quantity*,
-				Quantity *qy = new ValueQuantity(quantity::fN));
+				quantity::Quantity*,
+				quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN));
 			ContainerSingle1D(ContainerSingle1D const&);
 			~ContainerSingle1D() override;
 
 			virtual void initialize(std::string const& folder, 
-				Quantity*,
-				Quantity *qy = new ValueQuantity(quantity::fN),
+				quantity::Quantity*,
+				quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
 				int debug=0);
 
 			virtual void initialize(std::string const& folder, 
 				std::string const&, 
-				Quantity*,
-				Quantity *qy = new ValueQuantity(quantity::fN),
+				quantity::Quantity*,
+				quantity::Quantity *qy = new quantity::ValueQuantity(quantity::fN),
 				int debug=0);
                         using Container::initialize;
 			//	booking
@@ -101,10 +100,13 @@ namespace hcaldqm
 
 			virtual void extendAxisRange(int);
 
+			virtual void showOverflowX(bool showOverflow);
+			virtual void showOverflowY(bool showOverflow);
+
 		protected:
 			MonitorElement				*_me;
-			Quantity					*_qx;
-			Quantity					*_qy;
+			quantity::Quantity					*_qx;
+			quantity::Quantity					*_qy;
 
 			virtual void customize();
 	};

DQM/HcalCommon/interface/ContainerSingle2D.h

@@ -17,31 +17,30 @@
 
 namespace hcaldqm
 {
-	using namespace quantity;
 	class ContainerSingle2D : public Container
 	{
 		public:
 			ContainerSingle2D();
 			ContainerSingle2D(std::string const& folder, 
-				Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fN));
+				quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN));
 			ContainerSingle2D(std::string const& folder, 
 				std::string const&,
-				Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fN),
+				quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
 				int debug=0);
 			ContainerSingle2D(ContainerSingle2D const&);
 			~ContainerSingle2D() override;
 
 			virtual void initialize(std::string const& folder, 
-				Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fN),
+				quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
 				int debug=0);
 
 			virtual void initialize(std::string const& folder, 
 				std::string const&,
-				Quantity*, Quantity*,
-				Quantity *qz = new ValueQuantity(quantity::fN),
+				quantity::Quantity*, quantity::Quantity*,
+				quantity::Quantity *qz = new quantity::ValueQuantity(quantity::fN),
 				int debug=0);
 			using Container::initialize;
 			//	booking
@@ -154,11 +153,13 @@ namespace hcaldqm
 
 			virtual void extendAxisRange(int);
 
+			void showOverflowZ(bool showOverflow);
+
 		protected:
 			MonitorElement					*_me;
-			Quantity						*_qx;
-			Quantity						*_qy;
-			Quantity						*_qz;
+			quantity::Quantity				*_qx;
+			quantity::Quantity				*_qy;
+			quantity::Quantity				*_qz;
 
 			virtual void customize();
 	};