Backport #18353 to 90X, plus update TP nsamples and adc2fC

DQM/HcalCommon/interface/Constants.h

@@ -32,17 +32,25 @@ namespace hcaldqm
 			24, 0, 20, 0, 21, 0, 25, 0, 31, 0,
 			35, 0, 37, 0, 34, 0, 30, 0, 22,22,
 			29,29, 32,32, 0, 0, 0, 0, 0, 0,
-			0, 0, 36, 0, 0, 0, 0, 0, 0, 0,
+			0, 0, 0, 0, 38, 0, 0, 0, 0, 0,
 			0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 		};
 		uint16_t const CRATE2FED[50] = {
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-			1102, 1104, 1118, 0, 1100, 1106, 0, 0, 0, 1120,
-			1116, 1108, 1122, 0, 1114, 1110, 1132, 1112, 0, 0,
-			0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+			// 2017 values:
+			0,0,0,0,0,0,0,0,0,0,
+			0,0,0,0,0,0,0,0,0,0,
+			1102,1104,1118,0,1100,1106,0,0,0,1120,
+			1116,1108,1122,0,1114,1110,0,1112,1134,0,
+			0,0,0,0,0,0,0,0,0,0
+			// 2016 values:
+			//0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			//0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+			//1102, 1104, 1118, 0, 1100, 1106, 0, 0, 0, 1120,
+			//1116, 1108, 1122, 0, 1114, 1110, 1132, 1112, 0, 0,
+			//0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 		};
 
+
 		//	FEDs use the first 50 uTCA FED numbers only everywhere
 		int const FED_VME_MIN = FEDNumbering::MINHCALFEDID;
 		int const FED_VME_MAX = FEDNumbering::MAXHCALFEDID;
@@ -90,15 +98,15 @@ namespace hcaldqm
 		int const FIBER_VME_MIN = 1;
 		int const FIBER_VME_MAX = 8;
 		int const FIBER_VME_NUM = FIBER_VME_MAX-FIBER_VME_MIN+1;
-		int const FIBER_uTCA_MIN1 = 2;
-		int const FIBER_uTCA_MAX1 = 9;
-		int const FIBER_uTCA_MIN2 = 14;
-		int const FIBER_uTCA_MAX2 = 21;
+		int const FIBER_uTCA_MIN1 = 0;
+		int const FIBER_uTCA_MAX1 = 11;
+		int const FIBER_uTCA_MIN2 = 12;
+		int const FIBER_uTCA_MAX2 = 23;
 		int const FIBER_uTCA_NUM = FIBER_uTCA_MAX1-FIBER_uTCA_MIN1+1 + 
 			FIBER_uTCA_MAX2-FIBER_uTCA_MIN2+1;
 
 		int const FIBERCH_MIN = 0;
-		int const FIBERCH_MAX = 2;
+		int const FIBERCH_MAX = 5;
 		int const FIBERCH_NUM = FIBERCH_MAX-FIBERCH_MIN+1;
 
 		//	TP SLBs, Fibers
@@ -129,7 +137,7 @@ namespace hcaldqm
 		int const HF = 4;
 		int const SUBDET_NUM = 4;
 		int const TPSUBDET_NUM = 2;
-		int const DIGISIZE[SUBDET_NUM] = {10, 10, 10, 4};
+		int const DIGISIZE[SUBDET_NUM] = {10, 10, 10, 3};
 		std::string const SUBDET_NAME[SUBDET_NUM]={"HB", "HE", "HO", "HF"};
 		std::string const SUBDETPM_NAME[2*SUBDET_NUM] = { "HBM", "HBP",
 			"HEM", "HEP", "HOM", "HOP", "HFM", "HFP"};

DQM/HcalCommon/interface/DQClient.h

@@ -53,6 +53,10 @@ namespace hcaldqm
 			//	emap
 			HcalElectronicsMap const* _emap;
 
+			// Crate and crate eid lists
+			std::vector<int> _vCrates;
+			std::vector<uint32_t> _vhashCrates;
+
 			//	FED and FED Eids lists
 			std::vector<int> _vFEDs;
 			std::vector<uint32_t> _vhashFEDs;

DQM/HcalCommon/interface/DQHarvester.h

@@ -34,6 +34,10 @@ namespace hcaldqm
 			//	some counters
 			int _totalLS;
 
+			// Crate and crate eid lists
+			std::vector<int> _vCrates;
+			std::vector<uint32_t> _vhashCrates;
+
 			//	all FEDs
 			std::vector<int>		_vFEDs;
 			std::vector<uint32_t>	_vhashFEDs;

DQM/HcalCommon/interface/DQTask.h

@@ -67,6 +67,10 @@ namespace hcaldqm
 			//	Tags and corresponding Tokens
 			edm::InputTag		_tagRaw;
 			edm::EDGetTokenT<FEDRawDataCollection> _tokRaw;
+
+			// Conditions and emap
+			edm::ESHandle<HcalDbService> _dbService;
+			HcalElectronicsMap const* _emap;
 	};
 }