Fix: transparency wasnt propagating after config changes

cms-sw · Jan 30, 2019 · 9fdd5a1 · 9fdd5a1
1 parent d2f34e4
commit 9fdd5a1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc b/Fireworks/Calo/plugins/FWCaloClusterProxyBuilder.cc
@@ -213,7 +213,6 @@ void FWCaloClusterProxyBuilder::build(const reco::CaloCluster &iData, unsigned i
 
       if (!heatmap)
       {
-         hex_boxset->SetPickable(true);
          hex_boxset->CSCTakeAnyParentAsMaster();
          hex_boxset->CSCApplyMainColorToMatchingChildren();
          hex_boxset->CSCApplyMainTransparencyToMatchingChildren();
@@ -229,7 +228,6 @@ void FWCaloClusterProxyBuilder::build(const reco::CaloCluster &iData, unsigned i
 
       if (!heatmap)
       {
-         boxset->SetPickable(true);
          boxset->CSCTakeAnyParentAsMaster();
          boxset->CSCApplyMainColorToMatchingChildren();
          boxset->CSCApplyMainTransparencyToMatchingChildren();

diff --git a/Fireworks/Calo/plugins/FWHGCalMultiClusterProxyBuilder.cc b/Fireworks/Calo/plugins/FWHGCalMultiClusterProxyBuilder.cc
@@ -153,11 +153,11 @@ FWHGCalMultiClusterProxyBuilder::build(const reco::HGCalMultiCluster &iData, uns
 
       if (!heatmap)
       {
-         hex_boxset->SetPickable(true);
          hex_boxset->CSCTakeAnyParentAsMaster();
          hex_boxset->CSCApplyMainColorToMatchingChildren();
          hex_boxset->CSCApplyMainTransparencyToMatchingChildren();
          hex_boxset->SetMainColor(item()->modelInfo(iIndex).displayProperties().color());
+         hex_boxset->SetMainTransparency(item()->defaultDisplayProperties().transparency());
       }
       oItemHolder.AddElement(hex_boxset);
    }
@@ -168,11 +168,11 @@ FWHGCalMultiClusterProxyBuilder::build(const reco::HGCalMultiCluster &iData, uns
 
       if (!heatmap)
       {
-         boxset->SetPickable(true);
          boxset->CSCTakeAnyParentAsMaster();
          boxset->CSCApplyMainColorToMatchingChildren();
          boxset->CSCApplyMainTransparencyToMatchingChildren();
          boxset->SetMainColor(item()->modelInfo(iIndex).displayProperties().color());
+         boxset->SetMainTransparency(item()->defaultDisplayProperties().transparency());
       }
       oItemHolder.AddElement(boxset);
    }

diff --git a/Fireworks/SimData/plugins/FWCaloParticleProxyBuilder.cc b/Fireworks/SimData/plugins/FWCaloParticleProxyBuilder.cc
@@ -166,11 +166,11 @@ void FWCaloParticleProxyBuilder::build(const CaloParticle &iData, unsigned int i
 
       if (!heatmap)
       {
-         hex_boxset->SetPickable(true);
          hex_boxset->CSCTakeAnyParentAsMaster();
          hex_boxset->CSCApplyMainColorToMatchingChildren();
          hex_boxset->CSCApplyMainTransparencyToMatchingChildren();
          hex_boxset->SetMainColor(item()->modelInfo(iIndex).displayProperties().color());
+         hex_boxset->SetMainTransparency(item()->defaultDisplayProperties().transparency());
       }
       oItemHolder.AddElement(hex_boxset);
    }
@@ -181,11 +181,11 @@ void FWCaloParticleProxyBuilder::build(const CaloParticle &iData, unsigned int i
 
       if (!heatmap)
       {
-         boxset->SetPickable(true);
          boxset->CSCTakeAnyParentAsMaster();
          boxset->CSCApplyMainColorToMatchingChildren();
          boxset->CSCApplyMainTransparencyToMatchingChildren();
          boxset->SetMainColor(item()->modelInfo(iIndex).displayProperties().color());
+         boxset->SetMainTransparency(item()->defaultDisplayProperties().transparency());
       }
       oItemHolder.AddElement(boxset);
    }