---

yaml --- r: 76282 b: "refs/heads/CMSSW_7_1_X" c: 6f58317 h: "refs/heads/CMSSW_7_1_X" v: v3
cms-sw · Oct 25, 2009 · 858f3cc · 858f3cc
1 parent 62cb040
commit 858f3cc
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 23 deletions.
diff --git a/[refs] b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": fca58c94ace3c71b0b41f12e9a0df240498847b0
+"refs/heads/CMSSW_7_1_X": 6f583173b5190ce2330d712d77ae70d57c9d335c
diff --git a/trunk/L1TriggerConfig/RCTConfigProducers/src/RCTObjectKeysOnlineProd.cc b/trunk/L1TriggerConfig/RCTConfigProducers/src/RCTObjectKeysOnlineProd.cc
@@ -13,7 +13,7 @@
 //
 // Original Author:  Werner Man-Li Sun
 //         Created:  Fri Aug 22 19:51:36 CEST 2008
-// $Id: RCTObjectKeysOnlineProd.cc,v 1.5 2009/03/28 22:12:27 efron Exp $
+// $Id: RCTObjectKeysOnlineProd.cc,v 1.6 2009/10/20 14:56:45 efron Exp $
 //
 //
 
@@ -93,41 +93,66 @@ RCTObjectKeysOnlineProd::fillObjectKeys( ReturnType pL1TriggerKey )
 	  return ;
 	}
 
+
       l1t::OMDSReader::QueryResults scaleKeyResults =
 	m_omdsReader.basicQuery( "L1T_SCALE_CALO_ET_THRESHOLD_ID",
 				 "CMS_RCT",
 				 "PAREM_CONF",
 				 "PAREM_CONF.PAREM_KEY",
 				 paremKeyResults );  // not null no need to check
 
-
-      l1t::OMDSReader::QueryResults ecalScaleKeyResults =
-	m_omdsReader.basicQuery( "ECAL_LUT_CONFIG_ID",
-				 "CMS_RCT",
-				 "ECAL_SCALE_KEY",
-				 "ECAL_SCALE_KEY.ECAL_TAG",
-				 m_omdsReader.basicQuery("ECAL_CONF",
-							 "CMS_RCT",
-							 "RCT_CONF",
-							 "RCT_CONF.ECAL_CONF",
-							 m_omdsReader.singleAttribute(rctKey)));
-       if( ecalScaleKeyResults.queryFailed() ||
-	  paremKeyResults.numberRows() > 1 ) // check query successful)
-
+      l1t::OMDSReader::QueryResults ecalKeyResults =
+	m_omdsReader.basicQuery("ECAL_CONF",
+				"CMS_RCT",
+				"RCT_CONF",
+				"RCT_CONF.RCT_KEY",
+				m_omdsReader.singleAttribute(rctKey));
+      //      std::cout << " empty row for ECAL_CONF" <<std::endl;
+      if( ecalKeyResults.queryFailed() ||
+	  ecalKeyResults.numberRows() > 1 ) // check query successful)	
 	{
-	  edm::LogError( "L1-O2O" ) << "Problem with RCT Parameter key." ;
+	  edm::LogError( "L1-O2O" ) << "Problem with rct_conf.ecal_conf." ;
 	  return ;
 	}
-       if(ecalScaleKeyResults.numberRows() == 0 ) // NULL Quantity
+      std::string ecalKey;
+      if(!ecalKeyResults.fillVariable(ecalKey))
 	 ecalScaleKey = "NULL";
-       else {
-	 int ecalScaleTemp;
-	 ecalScaleKeyResults.fillVariable( ecalScaleTemp ) ;
+      else {
+	std::cout << "ecal key " << ecalKey <<std::endl;
+	if( ecalKey == "NULL")
+	  ecalScaleKey = "NULL";
+	else if(ecalKey == "IDENTITY")
+	  ecalScaleKey = "IDENTITY";
+	else {
+
+
+	l1t::OMDSReader::QueryResults ecalScaleKeyResults =
+	  m_omdsReader.basicQuery( "ECAL_LUT_CONFIG_ID",
+				     "CMS_RCT",
+				     "ECAL_SCALE_KEY",
+				     "ECAL_SCALE_KEY.ECAL_TAG",
+				     ecalKeyResults);
+
+	  if( ecalScaleKeyResults.queryFailed() ||
+	      ecalScaleKeyResults.numberRows() > 1 ) // check query successful)
+	    {
+	      std::cout << " nrows " << ecalScaleKeyResults.numberRows() <<std::endl;
+	      edm::LogError( "L1-O2O" ) << "bad results from lut_config_id." ;
+	      return ;
+	    }
+	  int ecalScaleTemp;
+
+	  ecalScaleKeyResults.fillVariable( ecalScaleTemp );
+
+
+
+
 	 std::stringstream ss;
 	 ss << ecalScaleTemp;
 	 ecalScaleKey = ss.str();
-       }
-
+	}
+      }
+      std::cout << "ecalScaleKey " <<ecalScaleKey <<std::endl;
       paremKeyResults.fillVariable( paremKey ) ;
       scaleKeyResults.fillVariable( scaleKey ) ;