Merge pull request #9930 from alja/75x-config

75x Fireworks: port Fireworks configuration changes from 74
cms-sw · Jun 27, 2015 · 99b445e · 99b445e
2 parents ab34265 + 783c9f0
commit 99b445e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/Fireworks/Core/macros/aod.fwc b/Fireworks/Core/macros/aod.fwc
@@ -167,7 +167,7 @@
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak5PFJets</string>
+     <string>ak4PFJets</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>

diff --git a/Fireworks/Core/macros/ispy.fwc b/Fireworks/Core/macros/ispy.fwc
@@ -2,10 +2,10 @@
  <config name="EventItems" version="1">
   <config name="Jets" version="3">
    <config name="type" version="0">
-     <string>std::vector&lt;reco::CaloJet&gt;</string>
+     <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>iterativeCone5CaloJets</string>
+     <string>ak4PFJets</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -1120,6 +1120,4 @@
     <string>reco::Vertex</string>
   </config>
  </config>
- <config name="TriggerTables" version="1">
- </config>
 </config>
diff --git a/Fireworks/Core/macros/pflow.fwc b/Fireworks/Core/macros/pflow.fwc
@@ -567,7 +567,7 @@
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak5PFJets</string>
+     <string>ak4PFJets</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -599,7 +599,7 @@
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak5PFJets</string>
+     <string>ak4PFJets</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>

diff --git a/Fireworks/Core/macros/pflow_algo.fwc b/Fireworks/Core/macros/pflow_algo.fwc
@@ -567,7 +567,7 @@
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak5PFJets</string>
+     <string>ak4PFJets</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -599,7 +599,7 @@
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak5PFJets</string>
+     <string>ak4PFJets</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>

diff --git a/Fireworks/Core/macros/reco.fwc b/Fireworks/Core/macros/reco.fwc
@@ -69,7 +69,7 @@
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak5PFJets</string>
+     <string>ak4PFJets</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>