diff --git a/[refs] b/[refs]
index 330ed59a6ff2e..7c4ee36d254d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,3 +1,3 @@
 ---
 refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
-"refs/heads/CMSSW_7_1_X": e1c8d39ea0ef5fed798e68273728ce9a6cd541c2
+"refs/heads/CMSSW_7_1_X": c30e36dd49463f13ff25ff8b6e65cef4398318fa
diff --git a/trunk/Fireworks/Core/src/FW3DLegoEveHistProxyBuilder.cc b/trunk/Fireworks/Core/src/FW3DLegoEveHistProxyBuilder.cc
index cb6a7c1b19ec1..6a60cf5363eac 100644
--- a/trunk/Fireworks/Core/src/FW3DLegoEveHistProxyBuilder.cc
+++ b/trunk/Fireworks/Core/src/FW3DLegoEveHistProxyBuilder.cc
@@ -8,7 +8,7 @@
 //
 // Original Author:  Chris Jones
 //         Created:  Sat Jul  5 11:26:11 EDT 2008
-// $Id: FW3DLegoEveHistProxyBuilder.cc,v 1.4 2009/01/23 21:35:42 amraktad Exp $
+// $Id: FW3DLegoEveHistProxyBuilder.cc,v 1.5 2009/10/23 01:02:52 chrjones Exp $
 //
 
 // system include files
@@ -21,6 +21,8 @@
 #include "Fireworks/Core/interface/FW3DLegoEveHistProxyBuilder.h"
 #include "Fireworks/Core/interface/FWEventItem.h"
 
+#include "Fireworks/Calo/src/FWFromTEveCaloDataSelector.h"
+
 
 //
 // constants, enums and typedefs
@@ -67,6 +69,11 @@ FW3DLegoEveHistProxyBuilder::attach(TEveElement* iElement,
                                     TEveCaloDataHist* iHist)
 {
    m_data = iHist;
+   if(0==m_data->GetUserData()) {
+      FWFromTEveCaloDataSelector* sel = new FWFromTEveCaloDataSelector(m_data);
+      //make sure it is accessible via the base class
+      iHist->SetUserData(static_cast<FWFromEveSelectorBase*>(sel));
+   }
 }
 
 void
@@ -76,6 +83,13 @@ FW3DLegoEveHistProxyBuilder::build()
    if(0!=m_hist && -1 == m_sliceIndex) {
       m_sliceIndex = m_data->AddHistogram(m_hist);
       m_data->RefSliceInfo(m_sliceIndex).Setup(item()->name().c_str(), 0., item()->defaultDisplayProperties().color());
+      
+      FWFromEveSelectorBase* base = reinterpret_cast<FWFromEveSelectorBase*>(m_data->GetUserData());
+      assert(0!=base);
+      FWFromTEveCaloDataSelector* sel = dynamic_cast<FWFromTEveCaloDataSelector*> (base);
+      assert(0!=sel);
+      sel->addSliceSelector(m_sliceIndex,FWFromSliceSelector(m_hist,item()));
+      
    }
    m_data->DataChanged();
 }