Merge pull request #10595 from alja/dima-750-cfg

75x Fireworks:Update collection entry in configuration files
cms-sw · Aug 17, 2015 · 5f29141 · 5f29141
2 parents b7d4583 + 8a2f447
commit 5f29141
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 49 deletions.
diff --git a/Fireworks/Core/interface/FWGUIEventSelector.h b/Fireworks/Core/interface/FWGUIEventSelector.h
@@ -7,7 +7,7 @@ class TGLabel;
 class TGCheckButton;
 class TGComboBox;
 
-class FWEventSelector;
+struct FWEventSelector;
 class FWHLTValidator;
 class FWCustomIconsButton;
 class FWGUIValidatingTextEntry;

diff --git a/Fireworks/Core/interface/FWPartialConfig.h b/Fireworks/Core/interface/FWPartialConfig.h
@@ -48,7 +48,7 @@ class FWPartialConfigSaveGUI : public FWPartialConfigGUI
    FWPartialConfigSaveGUI( const char* path_out,const char* path_in, FWConfigurationManager* );
   ~FWPartialConfigSaveGUI() {}
 
-  void Write();
+  void WriteConfig();
 
  private:
   std::string m_outFileName;

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>ak4PFJets</string>
+     <string>ak4PFJetsCHS</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -239,6 +239,11 @@
      <string>0</string>
    </config>
    <config name="PBConfig" version="1">
+    <config name="Var" version="1">
+     <config name="LineWidth" version="0">
+       <string>1</string>
+     </config>
+    </config>
    </config>
   </config>
   <config name="Muons" version="6">
@@ -273,6 +278,11 @@
      <string>0</string>
    </config>
    <config name="PBConfig" version="1">
+    <config name="Var" version="1">
+     <config name="LineWidth" version="0">
+       <string>1</string>
+     </config>
+    </config>
    </config>
   </config>
   <config name="Electrons" version="6">

diff --git a/Fireworks/Core/macros/ispy.fwc b/Fireworks/Core/macros/ispy.fwc
@@ -5,7 +5,7 @@
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak4PFJets</string>
+     <string>ak4PFJetsCHS</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -92,7 +92,7 @@
      <string>std::vector&lt;reco::GsfElectron&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>gsfElectrons</string>
+     <string>gedGsfElectrons</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -205,10 +205,10 @@
   </config>
   <config name="MET" version="3">
    <config name="type" version="0">
-     <string>std::vector&lt;reco::MET&gt;</string>
+     <string>std::vector&lt;reco::PFMET&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>tcMet</string>
+     <string>pfMet</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>

diff --git a/Fireworks/Core/macros/reco.fwc b/Fireworks/Core/macros/reco.fwc
@@ -1,6 +1,6 @@
 <config name="top" version="1">
  <config name="EventItems" version="1">
-  <config name="ECal" version="4">
+  <config name="ECal" version="6">
    <config name="type" version="0">
      <string>edm::SortedCollection&lt;CaloTower,edm::StrictWeakOrdering&lt;CaloTower&gt; &gt;</string>
    </config>
@@ -31,8 +31,10 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
-  <config name="HCal" version="4">
+  <config name="HCal" version="6">
    <config name="type" version="0">
      <string>edm::SortedCollection&lt;CaloTower,edm::StrictWeakOrdering&lt;CaloTower&gt; &gt;</string>
    </config>
@@ -63,13 +65,15 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
   <config name="Jets" version="6">
    <config name="type" version="0">
      <string>std::vector&lt;reco::PFJet&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>ak4PFJets</string>
+     <string>ak4PFJetsCHS</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -95,8 +99,21 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+    <config name="Var" version="1">
+     <config name="Draw Labels in RhoPhi View" version="0">
+       <string>0</string>
+     </config>
+     <config name="Draw Labels in RhoZ View" version="0">
+       <string>0</string>
+     </config>
+     <config name="Label Offset" version="0">
+       <string>2.1</string>
+     </config>
+    </config>
+   </config>
   </config>
-  <config name="Tracks" version="4">
+  <config name="Tracks" version="6">
    <config name="type" version="0">
      <string>std::vector&lt;reco::Track&gt;</string>
    </config>
@@ -127,8 +144,15 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+    <config name="Var" version="1">
+     <config name="LineWidth" version="0">
+       <string>1</string>
+     </config>
+    </config>
+   </config>
   </config>
-  <config name="Muons" version="4">
+  <config name="Muons" version="6">
    <config name="type" version="0">
      <string>std::vector&lt;reco::Muon&gt;</string>
    </config>
@@ -159,13 +183,20 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+    <config name="Var" version="1">
+     <config name="LineWidth" version="0">
+       <string>1</string>
+     </config>
+    </config>
+   </config>
   </config>
-  <config name="Electrons" version="4">
+  <config name="Electrons" version="6">
    <config name="type" version="0">
      <string>std::vector&lt;reco::GsfElectron&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>gsfElectrons</string>
+     <string>gedGsfElectrons</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -191,8 +222,10 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
-  <config name="Vertices" version="4">
+  <config name="Vertices" version="6">
    <config name="type" version="0">
      <string>std::vector&lt;reco::Vertex&gt;</string>
    </config>
@@ -223,8 +256,27 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+    <config name="Var" version="1">
+     <config name="Draw Tracks" version="0">
+       <string>0</string>
+     </config>
+     <config name="Draw Pseudo Track" version="0">
+       <string>0</string>
+     </config>
+     <config name="Draw Ellipse" version="0">
+       <string>0</string>
+     </config>
+     <config name="Scale Ellipse" version="0">
+       <string>2</string>
+     </config>
+     <config name="Ellipse Color Index" version="0">
+       <string>6</string>
+     </config>
+    </config>
+   </config>
   </config>
-  <config name="BeamSpot" version="5">
+  <config name="BeamSpot" version="6">
    <config name="type" version="0">
      <string>reco::BeamSpot</string>
    </config>
@@ -255,8 +307,10 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
-  <config name="DT-segments" version="4">
+  <config name="DT-segments" version="6">
    <config name="type" version="0">
      <string>edm::RangeMap&lt;DTChamberId,edm::OwnVector&lt;DTRecSegment4D,edm::ClonePolicy&lt;DTRecSegment4D&gt; &gt;,edm::ClonePolicy&lt;DTRecSegment4D&gt; &gt;</string>
    </config>
@@ -287,8 +341,10 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
-  <config name="CSC-segments" version="4">
+  <config name="CSC-segments" version="6">
    <config name="type" version="0">
      <string>edm::RangeMap&lt;CSCDetId,edm::OwnVector&lt;CSCSegment,edm::ClonePolicy&lt;CSCSegment&gt; &gt;,edm::ClonePolicy&lt;CSCSegment&gt; &gt;</string>
    </config>
@@ -319,13 +375,15 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
-  <config name="Photons" version="4">
+  <config name="Photons" version="6">
    <config name="type" version="0">
      <string>std::vector&lt;reco::Photon&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>photons</string>
+     <string>gedPhotons</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -351,13 +409,15 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
-  <config name="MET" version="4">
+  <config name="MET" version="6">
    <config name="type" version="0">
-     <string>std::vector&lt;reco::MET&gt;</string>
+     <string>std::vector&lt;reco::PFMET&gt;</string>
    </config>
    <config name="moduleLabel" version="0">
-     <string>tcMet</string>
+     <string>pfMet</string>
    </config>
    <config name="productInstanceLabel" version="0">
      <string></string>
@@ -383,6 +443,8 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
   <config name="Conversions" version="6">
    <config name="type" version="0">
@@ -415,6 +477,8 @@
    <config name="transparency" version="0">
      <string>0</string>
    </config>
+   <config name="PBConfig" version="1">
+   </config>
   </config>
  </config>
  <config name="EventNavigator" version="1">

diff --git a/Fireworks/Core/src/CmsShowMainFrame.cc b/Fireworks/Core/src/CmsShowMainFrame.cc
@@ -192,10 +192,6 @@ CmsShowMainFrame::CmsShowMainFrame(const TGWindow *p,UInt_t w,UInt_t h,FWGUIMana
    // exportImages->createShortcut(kKey_P, "CTRL+SHIFT", GetId());
    quit->createShortcut(kKey_Q, "CTRL", GetId());
 
-   loadPartialConfig->createShortcut(kKey_W, "CTRL", GetId());
-   savePartialConfig->createShortcut(kKey_Y, "CTRL", GetId());
-   savePartialConfigAs->createShortcut(kKey_Y, "CTRL+SHIFT", GetId());
-
    TGPopupMenu *editMenu = new TGPopupMenu(gClient->GetRoot());
    menuBar->AddPopup("Edit", editMenu, new TGLayoutHints(kLHintsTop | kLHintsLeft, 0, 4, 2, 0));
 

diff --git a/Fireworks/Core/src/FWGUIManager.cc b/Fireworks/Core/src/FWGUIManager.cc
@@ -80,6 +80,7 @@
 
 #include "Fireworks/Core/interface/FWEventItem.h"
 #include "Fireworks/Core/interface/FW3DViewBase.h"
+#include "Fireworks/Core/interface/FWExpressionException.h"
 
 #include "FWCore/Common/interface/EventBase.h"
 
@@ -651,30 +652,37 @@ FWGUIManager::showEDIFrame(int iToShow)
 
 void
 FWGUIManager::open3DRegion()
-{
-   FWModelId id =  *(m_context->selectionManager()->selected().begin());
-   float eta =0, phi = 0;
-   {
+{    
+   try {
+      FWModelId id =  *(m_context->selectionManager()->selected().begin());
+      float eta =0, phi = 0;
+
       edm::TypeWithDict type = edm::TypeWithDict((TClass*)id.item()->modelType());
       using namespace boost::spirit::classic;
       reco::parser::ExpressionPtr tmpPtr;
       reco::parser::Grammar grammar(tmpPtr,type);
       edm::ObjectWithDict o(type, (void*)id.item()->modelData(id.index()));
-      try {
-         parse("theta()", grammar.use_parser<1>() >> end_p, space_p).full;
-         eta =  tmpPtr->value(o);
-         parse("phi()", grammar.use_parser<1>() >> end_p, space_p).full;
+
+      if (parse("theta()", grammar.use_parser<1>() >> end_p, space_p).full)
+        eta =  tmpPtr->value(o);
+      else
+	throw FWExpressionException("syntax error", -1);
+
+      if (parse("phi()", grammar.use_parser<1>() >> end_p, space_p).full)
          phi =  tmpPtr->value(o);
+      else
+	throw FWExpressionException("syntax error", -1);
 
-         ViewMap_i it = createView( "3D Tower", m_viewSecPack->NewSlot());
-         FW3DViewBase* v = static_cast<FW3DViewBase*>(it->second);
-         v->setClip(eta, phi);
-         it->first->UndockWindow();
-      }
-      catch(const reco::parser::BaseException& e)
-      {
-         std::cout <<" FWModelFilter failed to base "<< e.what() << std::endl;
-      }
+
+
+      ViewMap_i it = createView( "3D Tower", m_viewSecPack->NewSlot());
+      FW3DViewBase* v = static_cast<FW3DViewBase*>(it->second);
+      v->setClip(eta, phi);
+      it->first->UndockWindow();
+   }
+   catch(const reco::parser::BaseException& e)
+   {
+     fwLog(fwlog::kError) <<"FWGUIManager::open3DRegion()  failed to base "<< e.what() << std::endl;
    }
 }
 

diff --git a/Fireworks/Core/src/FWPartialConfig.cc b/Fireworks/Core/src/FWPartialConfig.cc
@@ -160,7 +160,7 @@ FWPartialConfigSaveGUI::FWPartialConfigSaveGUI( const char* path_out, const char
    AddFrame(hf, new TGLayoutHints( kLHintsRight| kLHintsBottom, 1, 1, 2, 4));
 
    TGTextButton* write = new TGTextButton(hf, " Write ");
-   write->Connect("Clicked()", "FWPartialConfigSaveGUI", this, "Write()");
+   write->Connect("Clicked()", "FWPartialConfigSaveGUI", this, "WriteConfig()");
    hf->AddFrame(write, new TGLayoutHints(kLHintsExpandX, 2, 2, 0, 0));
 
    TGTextButton* cancel = new TGTextButton(hf, " Cancel ");
@@ -178,7 +178,7 @@ FWPartialConfigSaveGUI::FWPartialConfigSaveGUI( const char* path_out, const char
 
 
 void
-FWPartialConfigSaveGUI::Write()
+FWPartialConfigSaveGUI::WriteConfig()
 {
     FWConfiguration destination;
     {