New CondFormats to replace Legacy versions for Stable Params, Prescal…

…es, and Vetos.

CondCore/Utilities/src/CondDBFetch.cc

@@ -213,6 +213,7 @@ namespace cond {
       FETCH_PAYLOAD_CASE( L1TUtmObject )
       FETCH_PAYLOAD_CASE( L1TUtmScale )
       FETCH_PAYLOAD_CASE( L1TUtmTriggerMenu )
+      FETCH_PAYLOAD_CASE( L1TGlobalParameters )
       FETCH_PAYLOAD_CASE( L1TriggerKey )
       FETCH_PAYLOAD_CASE( L1TriggerKeyList )
       FETCH_PAYLOAD_CASE( lumi::LumiSectionData )
@@ -286,6 +287,7 @@ namespace cond {
       FETCH_PAYLOAD_CASE( EcalCondObjectContainer<EcalXtalGroupId> )
       FETCH_PAYLOAD_CASE( EcalCondObjectContainer<float> )
       FETCH_PAYLOAD_CASE( MagFieldConfig )
+      FETCH_PAYLOAD_CASE( L1TGlobalPrescalesVetos )
 
       //   
       if( payloadTypeName == "PhysicsTools::Calibration::Histogram3D<double,double,double,double>" ){    

CondCore/Utilities/src/CondDBImport.cc

@@ -225,6 +225,7 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( L1TUtmObject )
       IMPORT_PAYLOAD_CASE( L1TUtmScale )
       IMPORT_PAYLOAD_CASE( L1TUtmTriggerMenu )
+      IMPORT_PAYLOAD_CASE( L1TGlobalParameters )
       IMPORT_PAYLOAD_CASE( L1TriggerKey )
       IMPORT_PAYLOAD_CASE( MagFieldConfig )
       if( inputTypeName == "L1TriggerKeyList" ){ 
@@ -304,6 +305,7 @@ namespace cond {
       IMPORT_PAYLOAD_CASE( EcalCondObjectContainer<EcalTPGPedestal> )
       IMPORT_PAYLOAD_CASE( EcalCondObjectContainer<EcalXtalGroupId> )
       IMPORT_PAYLOAD_CASE( EcalCondObjectContainer<float> )
+      IMPORT_PAYLOAD_CASE( L1TGlobalPrescalesVetos )
       if( inputTypeName == "PhysicsTools::Calibration::Histogram3D<double,double,double,double>" ){
 	match = true;
 	const PhysicsTools::Calibration::Histogram3D<double,double,double,double>& obj = *static_cast<const PhysicsTools::Calibration::Histogram3D<double,double,double,double>*>( inputPtr ); 

CondCore/Utilities/src/CondFormats.h

@@ -225,6 +225,8 @@
 #include "CondFormats/L1TObjects/interface/L1TUtmObject.h"
 #include "CondFormats/L1TObjects/interface/L1TUtmScale.h"
 #include "CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h"
+#include "CondFormats/L1TObjects/interface/L1TGlobalParameters.h"
+#include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h"
 #include "CondFormats/L1TObjects/interface/L1TriggerKey.h"
 #include "CondFormats/L1TObjects/interface/L1TriggerKeyList.h"
 #include "CondFormats/PhysicsToolsObjects/interface/Histogram3D.h"

CondFormats/DataRecord/interface/L1TGlobalParametersRcd.h

@@ -0,0 +1,5 @@
+#ifndef CondFormatsDataRecord_L1TGlobalParametersRcd_h
+#define CondFormatsDataRecord_L1TGlobalParametersRcd_h
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+class L1TGlobalParametersRcd : public edm::eventsetup::EventSetupRecordImplementation<L1TGlobalParametersRcd> {};
+#endif

CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosRcd.h

@@ -0,0 +1,19 @@
+// L1TGlobalPrescalesVetosRcd                                                                                            
+// Description: Record for L1TGlobalPrescalesVetos
+//
+// automatically generate by make_records.pl
+//
+#ifndef CondFormatsDataRecord_L1TGlobalPrescalesVetos_h
+#define CondFormatsDataRecord_L1TGlobalPrescalesVetos_h
+
+#include "FWCore/Framework/interface/EventSetupRecordImplementation.h"
+
+class L1TGlobalPrescalesVetosRcd : public edm::eventsetup::EventSetupRecordImplementation<L1TGlobalPrescalesVetosRcd> {};
+
+// Dependent record implmentation:
+//#include "FWCore/Framework/interface/DependentRecordImplementation.h"
+//#include "CondFormats/DataRecord/interface/L1TriggerKeyListRcd.h"
+//#include "CondFormats/DataRecord/interface/L1TriggerKeyRcd.h"
+//class L1TGlobalPrescalesVetosRcd : public edm::eventsetup::DependentRecordImplementation<L1TGlobalPrescalesVetosRcd, boost::mpl::vector<L1TriggerKeyListRcd,L1TriggerKeyRcd> > {};
+
+#endif

CondFormats/DataRecord/src/L1TGlobalParametersRcd.cc

@@ -0,0 +1,27 @@
+/**
+ * \class L1TGlobalParametersRcd
+ * 
+ * 
+ * Description: record for L1 GT stable parameters.  
+ *
+ * Implementation:
+ *    <TODO: enter implementation details>
+ *   
+ * \author: Vasile Mihai Ghete - HEPHY Vienna
+ * 
+ * $Date$
+ * $Revision$
+ *
+ */
+
+// this class header
+#include "CondFormats/DataRecord/interface/L1TGlobalParametersRcd.h"
+
+// system include files
+
+// user include files
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+//
+
+EVENTSETUP_RECORD_REG(L1TGlobalParametersRcd);

CondFormats/DataRecord/src/L1TGlobalPrescalesVetosRcd.cc

@@ -0,0 +1,8 @@
+// L1TGlobalPrescalesVetosRcd implementation
+
+// automatically generated by make_records.pl
+
+#include "CondFormats/DataRecord/interface/L1TGlobalPrescalesVetosRcd.h"
+#include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h"
+
+EVENTSETUP_RECORD_REG(L1TGlobalPrescalesVetosRcd);

CondFormats/L1TObjects/interface/L1TGlobalParameters.h

@@ -0,0 +1,58 @@
+#ifndef CondFormats_L1TObjects_L1TGlobalParameters_h
+#define CondFormats_L1TObjects_L1TGlobalParameters_h
+
+#include <vector>
+#include "CondFormats/Serialization/interface/Serializable.h"
+
+class L1TGlobalParameters{
+
+public:
+
+    L1TGlobalParameters(){}
+
+    ~L1TGlobalParameters(){}
+
+public:
+
+    /// bx in event
+    int m_totalBxInEvent; 
+
+    /// trigger decision
+
+    /// number of physics trigger algorithms
+    unsigned int m_numberPhysTriggers;
+
+    /// trigger objects
+
+    /// muons
+    unsigned int m_numberL1Mu;
+
+    /// e/gamma  objects
+    unsigned int m_numberL1EG;
+
+
+    ///  jets
+    unsigned int m_numberL1Jet;
+
+    ///  taus
+    unsigned int m_numberL1Tau;
+
+    /// hardware
+
+    /// number of condition chips
+    unsigned int m_numberChips;
+
+    /// number of pins on the GTL condition chips
+    unsigned int m_pinsOnChip;
+
+    /// correspondence "condition chip - GTL algorithm word" in the hardware
+    std::vector<int> m_orderOfChip;
+
+    int m_version;
+    std::vector<int> m_exp_ints;
+    std::vector<double> m_exp_doubles;
+
+    COND_SERIALIZABLE;
+};
+
+#endif 

CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h

@@ -0,0 +1,28 @@
+//  L1TGlobalPrescalesVetos
+//
+//  Table containing the entire set of prescales and masks for each L1T algorithm bit
+//
+
+#ifndef L1TGlobalPrescalesVetos_h
+#define L1TGlobalPrescalesVetos_h
+
+#include <vector>
+
+#include "CondFormats/Serialization/interface/Serializable.h"
+
+class L1TGlobalPrescalesVetos {
+ public:
+  L1TGlobalPrescalesVetos(){ version_ = 0; bxmask_default_=0; }
+
+  unsigned int version_;
+  std::vector<std::vector<int> > prescale_table_;
+  int bxmask_default_;
+  std::map<int, std::vector<int> > bxmask_map_;
+  std::vector<int>  veto_;
+  std::vector<int> exp_ints_;
+  std::vector<double> exp_doubles_;
+
+  COND_SERIALIZABLE;
+};
+
+#endif

CondFormats/L1TObjects/src/L1TGlobalParameters.cc

@@ -0,0 +1 @@
+#include "CondFormats/L1TObjects/interface/L1TGlobalParameters.h"

CondFormats/L1TObjects/src/L1TGlobalPrescalesVetos.cc

@@ -0,0 +1 @@
+#include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h"

CondFormats/L1TObjects/src/T_EventSetup_L1TGlobalParameters.cc

@@ -0,0 +1,5 @@
+
+#include "CondFormats/L1TObjects/interface/L1TGlobalParameters.h"
+#include "FWCore/Utilities/interface/typelookup.h"
+
+TYPELOOKUP_DATA_REG(L1TGlobalParameters);

CondFormats/L1TObjects/src/T_EventSetup_L1TGlobalPrescalesVetos.cc

@@ -0,0 +1,5 @@
+
+#include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h"
+#include "FWCore/Utilities/interface/typelookup.h"
+
+TYPELOOKUP_DATA_REG(L1TGlobalPrescalesVetos);

CondFormats/L1TObjects/src/classes.h

@@ -52,6 +52,7 @@
 #include "CondFormats/L1TObjects/interface/L1TMuonGlobalParams.h"
 #include "CondFormats/L1TObjects/interface/L1TMuonBarrelParams.h"
 
+#include "CondFormats/L1TObjects/interface/L1TGlobalParameters.h"
 #include "CondFormats/L1TObjects/interface/L1TUtmAlgorithm.h"
 #include "CondFormats/L1TObjects/interface/L1TUtmBin.h"
 #include "CondFormats/L1TObjects/interface/L1TUtmCondition.h"
@@ -61,6 +62,8 @@
 #include "CondFormats/L1TObjects/interface/L1TUtmScale.h"
 #include "CondFormats/L1TObjects/interface/L1TUtmTriggerMenu.h"
 
+#include "CondFormats/L1TObjects/interface/L1TGlobalPrescalesVetos.h"
+
 namespace CondFormats_L1TObjects {
   struct dictionary {
 
@@ -98,7 +101,6 @@ namespace CondFormats_L1TObjects {
     L1TMuonBarrelParams dummy18;
     std::vector<L1TMuonBarrelParams::Node> dummy18a;
 
-
     L1TUtmAlgorithm dummy19a;
     L1TUtmBin dummy19b;
     L1TUtmCondition dummy19c;
@@ -108,5 +110,9 @@ namespace CondFormats_L1TObjects {
     L1TUtmScale dummy19g;
     L1TUtmTriggerMenu dummy19h;
 
+    L1TGlobalPrescalesVetos dummy20;
+
+    L1TGlobalParameters dummy21;
+
   };
 }

CondFormats/L1TObjects/src/classes_def.xml

@@ -10,8 +10,7 @@
     <field name="sparams_" mapping="blob"/>  
     <field name="uparams_" mapping="blob"/>  
   </class>
-
-
+
   <class name="l1t::LUT">
     <field name="data_" mapping="blob"/>  
   </class>
@@ -326,5 +325,22 @@
     <field name="external_map_" mapping="blob" />
     <field name="token_to_condition_" mapping="blob" />
   </class>    
+
+  <class name="L1TGlobalParameters">
+   <field name="m_orderOfChip" mapping="blob" />
+   <field name="m_exp_ints" mapping="blob" />
+   <field name="m_exp_doubles" mapping="blob" />
+  </class>
+
+  <class name="L1TGlobalPrescalesVetos">
+   <field name="prescale_table_" mapping="blob" />
+   <field name="bxmask_map_" mapping="blob" />
+   <field name="veto_" mapping="blob" />
+   <field name="exp_ints_" mapping="blob" />
+   <field name="exp_doubles_" mapping="blob" />
+  </class>
+
+
+
 </lcgdict>
 

CondFormats/L1TObjects/test/testSerializationL1TObjects.cpp

@@ -135,6 +135,8 @@ int main()
     testSerialization<L1TUtmObject>();
     testSerialization<L1TUtmScale>();
     testSerialization<L1TUtmTriggerMenu>();
+    testSerialization<L1TGlobalPrescalesVetos>();
+    testSerialization<L1TGlobalParameters>();
 
 
     return 0;