Merge pull request #9277 from jingyucms/jingyu-minor-change-rct-csc

fix rct HF FED vector and ungang csc ME1/a
cms-sw · Jun 9, 2015 · 7fc0e49 · 7fc0e49
2 parents 75a018b + a846fa5
commit 7fc0e49
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 41 deletions.
diff --git a/DQM/Integration/python/test/l1temulator_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/test/l1temulator_dqm_sourceclient-live_cfg.py
@@ -84,7 +84,9 @@
 process.l1EmulatorMonitorEndPath = cms.EndPath(process.dqmEnv*process.dqmSaver)
 
 #
+process.valCscTriggerPrimitiveDigis.gangedME1a = cms.untracked.bool(False)
 
+process.valCsctfTrackDigis.SectorProcessor.gangedME1a = cms.untracked.bool(False)
 #
 process.schedule = cms.Schedule(process.rawToDigiPath,
                                 process.l1HwValEmulatorMonitorPath,

diff --git a/DQM/L1TMonitor/src/L1TdeRCT.cc b/DQM/L1TMonitor/src/L1TdeRCT.cc
@@ -74,24 +74,24 @@ const float CHNLMAX = 395.5;
 
 
 const int L1TdeRCT::crateFED[90]=
-    {613, 614, 603, 702, 718,
-     611, 612, 602, 700, 718,
-     627, 610, 601,716,  722,
-     625, 626, 609, 714, 722,
-     623, 624, 608, 712, 722,
-     621, 622, 607, 710, 720,
-     619, 620, 606, 708, 720,
-     617, 618, 605, 706, 720,
-     615, 616, 604, 704, 718,
-     631, 632, 648, 703, 719,
-     629, 630, 647, 701, 719,
-     645, 628, 646, 717, 723,
-     643, 644, 654, 715, 723,
-     641, 642, 653, 713, 723,
-     639, 640, 652, 711, 721,
-     637, 638, 651, 709, 721,
-     635, 636, 650, 707, 721,
-     633, 634, 649, 705, 719
+    {613, 614, 603, 702, 1118,
+     611, 612, 602, 700, 1118,
+     627, 610, 601,716,  1122,
+     625, 626, 609, 714, 1122,
+     623, 624, 608, 712, 1122,
+     621, 622, 607, 710, 1120,
+     619, 620, 606, 708, 1120,
+     617, 618, 605, 706, 1120,
+     615, 616, 604, 704, 1118,
+     631, 632, 648, 703, 1118,
+     629, 630, 647, 701, 1118,
+     645, 628, 646, 717, 1122,
+     643, 644, 654, 715, 1122,
+     641, 642, 653, 713, 1122,
+     639, 640, 652, 711, 1120,
+     637, 638, 651, 709, 1120,
+     635, 636, 650, 707, 1120,
+     633, 634, 649, 705, 1118
 };
 
 
@@ -1915,7 +1915,7 @@ void L1TdeRCT::readFEDVector(MonitorElement* histogram,const edm::EventSetup& es
   const std::vector<int> Feds = summary->m_fed_in;
   for(std::vector<int>::const_iterator cf = Feds.begin(); cf != Feds.end(); ++cf){
     int fedNum = *cf;
-    if(fedNum > 600 && fedNum <724) 
+    if(( fedNum > 600 && fedNum <724) || fedNum==1118 || fedNum==1120 || fedNum==1122) 
       caloFeds.push_back(fedNum);
   }
 

diff --git a/DQM/L1TMonitorClient/src/L1TDTTFClient.cc b/DQM/L1TMonitorClient/src/L1TDTTFClient.cc
@@ -36,8 +36,6 @@ L1TDTTFClient::~L1TDTTFClient(){
 //--------------------------------------------------------
 void L1TDTTFClient::book(DQMStore::IBooker &ibooker)
 {
-
-  ibooker.setCurrentFolder(l1tdttffolder_);
 
   edm::LogInfo("L1TDTTFClient")<<"[L1TDTTFClient]: Begin Job";
 
@@ -64,7 +62,7 @@ void L1TDTTFClient::book(DQMStore::IBooker &ibooker)
   char mename[100];//ME name
 
   /// SUMMARY
-
+  ibooker.setCurrentFolder(inclusivepath_); 
   /// DTTF Tracks per Wheel ditribution
   sprintf(hname, "dttf_02_nTracks");
   sprintf(mename, "DTTF Tracks by Wheel");

diff --git a/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc b/L1Trigger/RegionalCaloTrigger/plugins/L1RCTProducer.cc
@@ -14,24 +14,24 @@ using std::vector;
 using std::cout;
 using std::endl;
 const int L1RCTProducer::crateFED[18][5]=
-      {{613, 614, 603, 702, 718},
-    {611, 612, 602, 700, 718},
-    {627, 610, 601, 716, 722},
-    {625, 626, 609, 714, 722},
-    {623, 624, 608, 712, 722},
-    {621, 622, 607, 710, 720},
-    {619, 620, 606, 708, 720},
-    {617, 618, 605, 706, 720},
-    {615, 616, 604, 704, 718},
-    {631, 632, 648, 703, 719},
-    {629, 630, 647, 701, 719},
-    {645, 628, 646, 717, 723},
-    {643, 644, 654, 715, 723},
-    {641, 642, 653, 713, 723},
-    {639, 640, 652, 711, 721},
-    {637, 638, 651, 709, 721},
-    {635, 636, 650, 707, 721},
-    {633, 634, 649, 705, 719}};
+      {{613, 614, 603, 702, 1118},
+    {611, 612, 602, 700, 1118},
+    {627, 610, 601, 716, 1122},
+    {625, 626, 609, 714, 1122},
+    {623, 624, 608, 712, 1122},
+    {621, 622, 607, 710, 1120},
+    {619, 620, 606, 708, 1120},
+    {617, 618, 605, 706, 1120},
+    {615, 616, 604, 704, 1118},
+    {631, 632, 648, 703, 1118},
+    {629, 630, 647, 701, 1118},
+    {645, 628, 646, 717, 1122},
+    {643, 644, 654, 715, 1122},
+    {641, 642, 653, 713, 1122},
+    {639, 640, 652, 711, 1120},
+    {637, 638, 651, 709, 1120},
+    {635, 636, 650, 707, 1120},
+    {633, 634, 649, 705, 1118}};
 
 
 
@@ -199,7 +199,7 @@ void L1RCTProducer::updateFedVector(const edm::EventSetup& eventSetup, bool getF
   for(std::vector<int>::const_iterator cf = Feds.begin(); cf != Feds.end(); ++cf)
     {
       int fedNum = *cf;
-      if(fedNum > 600 && fedNum <724) 
+      if((fedNum > 600 && fedNum <724) || fedNum==1118 || fedNum == 1120 || fedNum == 1122) 
 	caloFeds.push_back(fedNum);
     }