Revert "74x: Additional features needed for P5 visualization"

Fireworks/Calo/plugins/FWCaloRecHitDigitSetProxyBuilder.cc

@@ -11,24 +11,20 @@
 #include "Fireworks/Core/interface/FWProxyBuilderConfiguration.h"
 
 FWCaloRecHitDigitSetProxyBuilder::FWCaloRecHitDigitSetProxyBuilder()
-   : m_invertBox(false), m_ignoreGeoShapeSize(false), m_enlarge(1.0)
+   : m_invertBox(false), m_ignoreGeoShapeSize(false) 
 {} 
 
 //______________________________________________________________________________
 
 void FWCaloRecHitDigitSetProxyBuilder::setItem(const FWEventItem* iItem)
 {
    FWProxyBuilderBase::setItem(iItem);
-   if (iItem) {
-      iItem->getConfig()->assertParam( "Enlarge", 1.0, 1.0, 5.0);
-      // iItem->getConfig()->assertParam( "IgnoreShapeSize", false);
-   }
+   // if (iItem) iItem->getConfig()->assertParam( "IgnoreShapeSize", false);
 }
 //______________________________________________________________________________
 
 void FWCaloRecHitDigitSetProxyBuilder::viewContextBoxScale( const float* corners, float scale, bool plotEt, std::vector<float>& scaledCorners, const CaloRecHit*)
 {
-   scale *= m_enlarge;
    if ( m_ignoreGeoShapeSize)
    {
       // Same functionality as fireworks::energyTower3DCorners()
@@ -145,7 +141,6 @@ FWCaloRecHitDigitSetProxyBuilder::build( const FWEventItem* iItem, TEveElementLi
    if (!size) return;
 
    // m_ignoreGeoShapeSize = item()->getConfig()->value<bool>("IgnoreShapeSize");
-   m_enlarge = item()->getConfig()->value<double>("Enlarge");
 
    std::vector<float> scaledCorners(24);
 

Fireworks/Calo/plugins/FWCaloRecHitDigitSetProxyBuilder.h

@@ -29,7 +29,6 @@ class FWCaloRecHitDigitSetProxyBuilder : public FWDigitSetProxyBuilder
 
    bool m_invertBox;
    bool m_ignoreGeoShapeSize;
-   double m_enlarge;
    TEveVector m_vector; // internal memeber, to avoid constant recreation
 };
 #endif

Fireworks/Core/doc/Core.doc

@@ -90,6 +90,7 @@
 - FWHFView
 - FWHLTTriggerTableView
 - FWHLTValidator
+- FWHandle
 - FWISpyView
 - FWIntValueListener
 - FWIntValueListenerBase

Fireworks/Core/interface/ActionsList.h

@@ -11,11 +11,6 @@ namespace cmsshow {
    extern const std::string sLoadConfig;
    extern const std::string sSaveConfig;
    extern const std::string sSaveConfigAs;
-
-   extern const std::string sLoadPartialConfig;
-   extern const std::string sSavePartialConfig;
-   extern const std::string sSavePartialConfigAs;
-
    extern const std::string sExportImage;
    extern const std::string sExportAllImages;
 

Fireworks/Core/interface/CmsShowMainBase.h

@@ -80,10 +80,7 @@ class CmsShowMainBase
 
    void writeToConfigFile(const std::string &config);
    void writeToCurrentConfigFile();
-   void writePartialToConfigFile();
    void reloadConfiguration(const std::string &config);
-   void partialWriteToConfigFile(const std::string &config);
-   void partialLoadConfiguration(const std::string &config);
    void setupConfiguration();
 
    void registerPhysicsObject(const FWPhysicsObjectDesc&iItem);
@@ -117,9 +114,8 @@ class CmsShowMainBase
    void playForward();
    void playBackward();
    bool isPlaying() const { return m_isPlaying; }
-
-   virtual void checkKeyBindingsOnPLayEventsStateChanged() {}
-   virtual void stopPlaying();
+   void setIsPlaying(bool value) { m_isPlaying = value; }
+   virtual void stopPlaying() = 0;
    virtual void autoLoadNewEvent() = 0;
 
    void setPlayLoop();

Fireworks/Core/interface/FW3DView.h

@@ -1,4 +1,4 @@
-#ifndef Fireworks_Core_FW3DView_h
+#ifndef Fireworks_Core_FW3DEnergyView_h
 #define Fireworks_Core_FW3DView_h
 // -*- C++ -*-
 //

Fireworks/Core/interface/FW3DViewBase.h

@@ -34,7 +34,6 @@ class FW3DViewGeometry;
 class FWColorManager;
 class TGLClip;
 class TEveLine;
-class TEveBoxSet;
 
 class FW3DViewDistanceMeasureTool;
 
@@ -62,7 +61,6 @@ class FW3DViewBase : public FWEveView
    virtual bool requestGLHandlerPick() const;
    void setCurrentDMTVertex(double x, double y, double z);
 
-   void showEcalBarrel(bool);
 private:
    FW3DViewBase(const FW3DViewBase&);    // stop default
 
@@ -80,9 +78,6 @@ class FW3DViewBase : public FWEveView
    FWBoolParameter m_showTrackerBarrel;
    FWBoolParameter m_showTrackerEndcap;
 
-   TEveBoxSet* m_ecalBarrel;
-   FWBoolParameter m_showEcalBarrel;
-
    FWEnumParameter m_rnrStyle;
    FWBoolParameter m_clipParam;
    FWBoolParameter m_selectable;

Fireworks/Core/interface/FWConfiguration.h

@@ -70,7 +70,6 @@ class FWConfiguration
    FWConfiguration& addValue(const std::string&);
    void swap(FWConfiguration& );
 
-   static void streamTo(std::ostream& oTo, const FWConfiguration& iConfig, const std::string &name);
 
 private:
 

Fireworks/Core/interface/FWConfigurationManager.h

@@ -42,14 +42,14 @@ class FWConfigurationManager
 
    void writeToFile(const std::string&) const;
    void readFromFile(const std::string&) const;
-   std::string guessAndReadFromFile(FWJobMetadataManager*) const;
+   void guessAndReadFromFile(FWJobMetadataManager*) const;
    // ---------- static member functions --------------------
 
    // ---------- member functions ---------------------------
    ///does not take ownership
    void add(const std::string& iName, FWConfigurable*);
 
-   void setIgnore() { m_ignore = true; }
+   void setIgnore() { m_ignore = false; }
    bool getIgnore() const { return m_ignore; }
 
 private:

Fireworks/Core/interface/FWFileEntry.h

@@ -1,6 +1,6 @@
 // -*- C++ -*-
 #ifndef Fireworks_Core_FWFileEntry_h
-#define Fireworks_Core_FWFileEntry_h
+#define Fireworks_Core_FWFileEntryr_h
 //
 // Package:     Core
 // Class  :     FWFileEntry

Fireworks/Core/interface/FWGUIEventFilter.h

@@ -1,7 +1,3 @@
-
-#ifndef Fireworks_Core_GUIEventFilter_h
-#define Fireworks_Core_GUIEventFilter_h
-
 #include <list>
 
 #include "TGFrame.h"
@@ -83,4 +79,3 @@ class FWGUIEventFilter: public TGMainFrame
    CmsShowNavigator*    m_navigator;
 };
 
-#endif

Fireworks/Core/interface/FWGUIManager.h

@@ -205,9 +205,7 @@ class FWGUIManager : public FWConfigurable
    sigc::signal<void> filterButtonClicked_;
    sigc::signal<void, const TGWindow*> showEventFilterGUI_;
    sigc::signal<void, const std::string&> writeToConfigurationFile_;
-   sigc::signal<void, const std::string&> writePartialToConfigurationFile_;
    sigc::signal<void, const std::string&> loadFromConfigurationFile_;
-   sigc::signal<void, const std::string&> loadPartialFromConfigurationFile_;
    sigc::signal<void, edm::RunNumber_t, edm::LuminosityBlockNumber_t, edm::EventNumber_t> changedEventId_;
    sigc::signal<void> goingToQuit_;
    sigc::signal<void> writeToPresentConfigurationFile_;
@@ -226,10 +224,7 @@ class FWGUIManager : public FWConfigurable
 
    bool promptForConfigurationFile(std::string &result, enum EFileDialogMode mode);
    void promptForSaveConfigurationFile();
-   void promptForPartialSaveConfigurationFile();
    void promptForLoadConfigurationFile();
-   void promptForPartialLoadConfigurationFile();
-   void savePartialToConfigurationFile();
 
    void delaySliderChanged(Int_t);
 

Fireworks/Core/interface/FWHandle.h

@@ -0,0 +1,72 @@
+#ifndef Fireworks_Core_FWHandle_h
+#define Fireworks_Core_FWHandle_h
+// -*- C++ -*-
+//
+// Package:     Core
+// Class  :     FWHandle
+//
+/**\class FWHandle FWHandle.h Fireworks/Core/interface/FWHandle.h
+
+   Description: Used to get a particular data item from a FWEventItem
+
+   Usage:
+    <usage>
+
+ */
+//
+// Original Author:  Chris Jones
+//         Created:  Thu Jan  3 19:23:45 EST 2008
+//
+
+// system include files
+#if !defined(__CINT__) && !defined(__MAKECINT__)
+//CINT can't handle parsing these files
+#include "DataFormats/Common/interface/Wrapper.h"
+#include "Fireworks/Core/interface/FWEventItem.h"
+#endif
+
+// user include files
+
+// forward declarations
+
+class FWHandle
+{
+
+public:
+   FWHandle() : data(0) {
+   }
+   //virtual ~FWHandle();
+
+   // ---------- const member functions ---------------------
+   const T* get() const {
+      return data_;
+   }
+
+   const T* operator->() const {
+      return data_;
+   }
+
+   const T& operator*() const {
+      return *data_;
+   }
+   // ---------- static member functions --------------------
+
+   // ---------- member functions ---------------------------
+   void getFrom(const FWEventItem& iItem) {
+      data_ = reinterpet_cast<const T*>(
+         iItem.data(edm::Wrapper<T>::productTypeInfo())
+         );
+   }
+
+private:
+   //FWHandle(const FWHandle&); // stop default
+
+   //const FWHandle& operator=(const FWHandle&); // stop default
+
+   // ---------- member data --------------------------------
+   const T* data_;
+
+};
+
+
+#endif

Fireworks/Core/interface/FWISpyView.h

@@ -24,6 +24,7 @@
 #include "Fireworks/Core/interface/FW3DViewBase.h"
 
 // forward declarations
+class TEveBoxSet;
 
 class FWISpyView : public FW3DViewBase
 {
@@ -33,6 +34,7 @@ class FWISpyView : public FW3DViewBase
    virtual void setContext(const fireworks::Context& x);
 
    virtual void populateController(ViewerParameterGUI&) const;
+   void showEcalBarrel(bool);
    // ---------- const member functions ---------------------
 
    // ---------- static member functions --------------------
@@ -44,7 +46,10 @@ class FWISpyView : public FW3DViewBase
 
    const FWISpyView& operator=(const FWISpyView&); // stop default
 
-   // ---------- member data --------------------------------};
+   // ---------- member data --------------------------------
+   TEveBoxSet* m_ecalBarrel;
+   FWBoolParameter m_showEcalBarrel;
 };
 
+
 #endif