Merge pull request #8365 from wmtan/PortBackFromROOT6IBL1

Port back from ROOT6 IB for commonality (L1)
cms-sw · Mar 18, 2015 · 4149b47 · 4149b47
2 parents 3a95422 + b5af8d8
commit 4149b47
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CondFormats/L1TObjects/src/classes_def.xml b/CondFormats/L1TObjects/src/classes_def.xml
@@ -166,6 +166,8 @@
   <class name="std::map<int, std::vector<L1GtObject> >"/>  
   <class name="std::map<int, std::vector<L1GtObject> >::value_type"/>  
   <class name="L1GtCondition"/>
+  <enum name="L1GtConditionCategory"/>
+  <enum name="L1GtConditionType"/>
   <class name="L1GtMuonTemplate"/>
   <class name="L1GtMuonTemplate::ObjectParameter"/>
   <class name="std::vector<L1GtMuonTemplate::ObjectParameter>"/>
@@ -237,4 +239,6 @@
   <class name="L1CaloGeometry" class_version="L1CaloGeometry_V01">
     <field name="m_gctEtaBinBoundaries" mapping="blob" />
   </class>
+  <enum name="L1GtBoard" />
+  <enum name="L1GtPsbQuad" />
 </lcgdict>
diff --git a/DataFormats/L1GlobalMuonTrigger/BuildFile.xml b/DataFormats/L1GlobalMuonTrigger/BuildFile.xml
@@ -1,7 +1,6 @@
 <use   name="DataFormats/Common"/>
 <use   name="FWCore/MessageLogger"/>
 
-<use   name="tbb"/>
 <export>
   <lib   name="1"/>
 </export>
diff --git a/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.cc b/L1Trigger/GlobalTrigger/plugins/CompareToObjectMapRecord.cc
@@ -16,6 +16,7 @@
 #include "CompareToObjectMapRecord.h"
 
 #include <algorithm>
+#include <iostream>
 #include <string>
 #include <vector>