Merge pull request #13538 from Martin-Grunewald/GTfix

Quick Fix for GT crashes in MDGW#2 (replacing #13514)
cms-sw · Mar 1, 2016 · cad854b · cad854b
2 parents 8e8ed3d + 6856487
commit cad854b
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/EventFilter/L1TRawToDigi/src/implementations_stage2/GTSetup.cc b/EventFilter/L1TRawToDigi/src/implementations_stage2/GTSetup.cc
@@ -56,11 +56,11 @@ namespace l1t {
 
             virtual UnpackerMap getUnpackers(int fed, int board, int amc, unsigned int fw) override {
 
-               auto muon_unp = UnpackerFactory::get()->make("stage2::MuonUnpacker");
-  	       auto egamma_unp = UnpackerFactory::get()->make("stage2::EGammaUnpacker");
-	       auto etsum_unp = UnpackerFactory::get()->make("stage2::EtSumUnpacker");
-	       auto jet_unp = UnpackerFactory::get()->make("stage2::JetUnpacker");
-	       auto tau_unp = UnpackerFactory::get()->make("stage2::TauUnpacker");
+	      //auto muon_unp = UnpackerFactory::get()->make("stage2::MuonUnpacker");
+	      //auto egamma_unp = UnpackerFactory::get()->make("stage2::EGammaUnpacker");
+	      //auto etsum_unp = UnpackerFactory::get()->make("stage2::EtSumUnpacker");
+	      //auto jet_unp = UnpackerFactory::get()->make("stage2::JetUnpacker");
+	      //auto tau_unp = UnpackerFactory::get()->make("stage2::TauUnpacker");
                auto alg_unp = UnpackerFactory::get()->make("stage2::GlobalAlgBlkUnpacker");
                auto ext_unp = UnpackerFactory::get()->make("stage2::GlobalExtBlkUnpacker");
 
@@ -70,17 +70,17 @@ namespace l1t {
                if (fed == 1404) {
 
 		 // From the rx buffers         
-		  res[0]  = muon_unp;
-		  res[2]  = muon_unp;
-		  res[4]  = muon_unp;
-		  res[6]  = muon_unp;
-		  res[8]  = egamma_unp;
-		  res[10] = egamma_unp;
-		  res[12] = jet_unp;
-                  res[14] = jet_unp;
-		  res[16] = tau_unp;
-		  res[18] = tau_unp;
-                  res[20] = etsum_unp;
+		 //res[0]  = muon_unp;
+		 //res[2]  = muon_unp;
+		 //res[4]  = muon_unp;
+		 //res[6]  = muon_unp;
+		 //res[8]  = egamma_unp;
+		 //res[10] = egamma_unp;
+		 //res[12] = jet_unp;
+		 //res[14] = jet_unp;
+		 //res[16] = tau_unp;
+		 //res[18] = tau_unp;
+		 //res[20] = etsum_unp;
 		  res[24] = ext_unp;
 		  //res[22] = empty link no data
 		  res[26] = ext_unp;