Partial fix to HGCal hexagons position, and SimCluster proxy

Calo/plugins/FWCaloClusterProxyBuilder.cc

@@ -240,7 +240,12 @@ void FWCaloClusterProxyBuilder::BuildItem(const reco::CaloCluster &iData,
         float centerX = (corners[6] + corners[6 + offset]) / 2;
         float centerY = (corners[7] + corners[7 + offset]) / 2;
         float radius = fabs(corners[6] - corners[6 + offset]) / 2;
-        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 90.0, shapes[3]);
+        /* The AddHex function angle seems to make a rotation around (0,0,0) (to be verified).  (REveBoxSet::AddHex(const REveVector& pos, Float_t r, Float_t angle, Float_t depth) https://root.cern/doc/v638/REveBoxSet_8cxx_source.html#l00228 )
+        While we want to make a rotation around the center of the hexagon.
+        For now set the angle to 0 (the hexagon will not have the correct rotation but its center will be in the correct location).
+        TODO do the rotation properly.
+        */
+        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 0., shapes[3]); // removed rotation
         if (heatmap) {
           energy ? hex_boxset->DigitColor(fwhgcal::gradient[0][colorFactor], fwhgcal::gradient[1][colorFactor], fwhgcal::gradient[2][colorFactor])
                  : hex_boxset->DigitColor(64, 64, 64);

Calo/plugins/FWHGCalMultiClusterProxyBuilder.cc

@@ -139,7 +139,12 @@ void FWHGCalMultiClusterProxyBuilder::BuildItem(const reco::HGCalMultiCluster &i
         float centerX = (corners[6] + corners[6 + offset]) / 2;
         float centerY = (corners[7] + corners[7 + offset]) / 2;
         float radius = fabs(corners[6] - corners[6 + offset]) / 2;
-        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 90.0, shapes[3]);
+        /* The AddHex function angle seems to make a rotation around (0,0,0) (to be verified).  (REveBoxSet::AddHex(const REveVector& pos, Float_t r, Float_t angle, Float_t depth) https://root.cern/doc/v638/REveBoxSet_8cxx_source.html#l00228 )
+        While we want to make a rotation around the center of the hexagon.
+        For now set the angle to 0 (the hexagon will not have the correct rotation but its center will be in the correct location).
+        TODO do the rotation properly.
+        */
+        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 0, shapes[3]);
         if (heatmap) {
           const uint8_t colorFactor = FWHGCAL_GRADIENT_STEPS * (fmin(m_hitmap[it->first]->energy() / saturation_energy, 1.0f));
           hex_boxset->DigitColor(fwhgcal::gradient[0][colorFactor], fwhgcal::gradient[1][colorFactor], fwhgcal::gradient[2][colorFactor]);

Calo/plugins/FWTracksterHitsProxyBuilder.cc

@@ -270,7 +270,12 @@ void FWTracksterHitsProxyBuilder::BuildItem(const ticl::Trackster &iData,
         float centerX = (corners[6] + corners[6 + offset]) / 2;
         float centerY = (corners[7] + corners[7 + offset]) / 2;
         float radius = fabs(corners[6] - corners[6 + offset]) / 2;
-        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 90.0, shapes[3]);
+        /* The AddHex function angle seems to make a rotation around (0,0,0) (to be verified).  (REveBoxSet::AddHex(const REveVector& pos, Float_t r, Float_t angle, Float_t depth) https://root.cern/doc/v638/REveBoxSet_8cxx_source.html#l00228 )
+        While we want to make a rotation around the center of the hexagon.
+        For now set the angle to 0 (the hexagon will not have the correct rotation but its center will be in the correct location).
+        TODO do the rotation properly.
+        */
+        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 0., shapes[3]);
         if (heatmap_) {
           energy ? hex_boxset->DigitColor(
                        fwhgcal::gradient[0][colorFactor], fwhgcal::gradient[1][colorFactor], fwhgcal::gradient[2][colorFactor], alpha)

Calo/plugins/FWTracksterLayersProxyBuilder.cc

@@ -37,7 +37,7 @@ class FWTracksterLayersProxyBuilder : public FWHeatmapProxyBuilderTemplate<ticl:
         item->getConfig()->assertParam("EnableTimeFilter", false);
         item->getConfig()->assertParam("TimeLowerBound(ns)", 0.01, 0.0, 75.0);
         item->getConfig()->assertParam("TimeUpperBound(ns)", 0.01, 0.0, 75.0);
-        item->getConfig()->assertParam("DisplayMode", 0.0, 0.0, 5.0);
+        item->getConfig()->assertParam("DisplayMode", 0L, 0L, 4L);
         item->getConfig()->assertParam("ProportionalityFactor", 1.0, 0.0, 1.0);
         FWHeatmapProxyBuilderTemplate::SetCollection(c);
     }
@@ -60,7 +60,7 @@ class FWTracksterLayersProxyBuilder : public FWHeatmapProxyBuilderTemplate<ticl:
     bool enableTimeFilter_;
     bool enablePositionLines_;
     bool enableEdges_;
-    double displayMode_;
+    long displayMode_;
     double proportionalityFactor_;
 };
 
@@ -112,7 +112,7 @@ void FWTracksterLayersProxyBuilder::Build() {
   enableTimeFilter_ = fwitem->getConfig()->value<bool>("EnableTimeFilter");
   enablePositionLines_ = fwitem->getConfig()->value<bool>("EnablePositionLines");
   enableEdges_ = fwitem->getConfig()->value<bool>("EnableEdges");
-  displayMode_ = fwitem->getConfig()->value<double>("DisplayMode");
+  displayMode_ = fwitem->getConfig()->value<long>("DisplayMode");
   proportionalityFactor_ = fwitem->getConfig()->value<double>("ProportionalityFactor");
 
 

SimData/plugins/FWCaloParticleProxyBuilder.cc

@@ -139,7 +139,14 @@ void FWCaloParticleProxyBuilder::BuildItem(const CaloParticle &iData, int idx, R
         float centerX = (corners[6] + corners[6 + offset]) / 2;
         float centerY = (corners[7] + corners[7 + offset]) / 2;
         float radius = fabs(corners[6] - corners[6 + offset]) / 2;
-        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, shapes[2], shapes[3]);
+        // hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, shapes[2], shapes[3]);
+        /* The AddHex function angle seems to make a rotation around (0,0,0) (to be verified).  (REveBoxSet::AddHex(const REveVector& pos, Float_t r, Float_t angle, Float_t depth) https://root.cern/doc/v638/REveBoxSet_8cxx_source.html#l00228 )
+        While we want to make a rotation around the center of the hexagon.
+        For now set the angle to 0 (the hexagon will not have the correct rotation but its center will be in the correct location).
+        TODO do the rotation properly.
+        */
+        hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 0., shapes[3]); 
+        // Needs to be properly computed
         if (heatmap) {
           const uint8_t colorFactor = FWHGCAL_GRADIENT_STEPS * (fmin(m_hitmap.at(it.first)->energy() / saturation_energy, 1.0f));
           hex_boxset->DigitColor(fwhgcal::gradient[0][colorFactor], fwhgcal::gradient[1][colorFactor], fwhgcal::gradient[2][colorFactor]);

SimData/plugins/FWSimClusterProxyBuilder.cc

@@ -0,0 +1,168 @@
+#include "FireworksWeb/Core/interface/FWProxyBuilderFactory.h"
+#include "FireworksWeb/Calo/interface/FWHeatmapProxyBuilderTemplate.h"
+
+#include "ROOT/REvePointSet.hxx"
+#include "ROOT/REveBoxSet.hxx"
+#include "ROOT/REveViewContext.hxx"
+#include "ROOT/REveDataSimpleProxyBuilderTemplate.hxx"
+
+#include "FireworksWeb/Core/interface/FWGeometry.h"
+#include "FireworksWeb/Core/interface/fwLog.h"
+#include "FireworksWeb/Core/interface/Context.h"
+
+
+#include "SimDataFormats/CaloAnalysis/interface/SimCluster.h"
+#include "DataFormats/HGCRecHit/interface/HGCRecHitCollections.h"
+
+using namespace ROOT::Experimental;
+
+
+class FWSimClusterProxyBuilder : public FWHeatmapProxyBuilderTemplate<SimCluster>
+{
+public:
+    REGISTER_FWPB_METHODS();
+
+    using FWHeatmapProxyBuilderTemplate<SimCluster>::BuildItem;
+    virtual void BuildItem(const SimCluster& iData, int /*idx*/, REveElement* iItemHolder, const REveViewContext* vc) override;
+};
+
+void FWSimClusterProxyBuilder::BuildItem(const SimCluster &iData, int idx, ROOT::Experimental::REveElement *oItemHolder, const ROOT::Experimental::REveViewContext *context)
+{
+  auto fwItem = dynamic_cast<FWWebEventItem *>(Collection());
+  const long layer = fwItem->getConfig()->value<long>("Layer");
+  const double saturation_energy = fwItem->getConfig()->value<double>("EnergyCutOff");
+  const bool z_plus = fwItem->getConfig()->value<bool>("Z+");
+  const bool z_minus = fwItem->getConfig()->value<bool>("Z-");
+
+
+  bool heatmap = fwItem->getConfig()->value<bool>("Heatmap");
+  if (heatmap && m_hitmap.empty()) {
+    fwLog(fwlog::kError) << "FWSimClusterProxyBuilder::BuildItem: Hit association map is empty. Disable hitmap!";
+    heatmap = false;
+  }
+
+
+  Color_t itemColor = Collection()->GetDataItem(idx)->GetMainColor();
+
+  bool h_hex(false);
+  REveBoxSet *hex_boxset = new REveBoxSet();
+  if (!heatmap) {
+    hex_boxset->UseSingleColor();
+    hex_boxset->SetMainColorPtr(new Color_t);
+    hex_boxset->SetMainColor(itemColor);
+  }
+  hex_boxset->SetPickable(true);
+  hex_boxset->Reset(REveBoxSet::kBT_InstancedScaledRotated, true, 64);
+  hex_boxset->SetAntiFlick(true);
+
+  bool h_box(false);
+  REveBoxSet *boxset = new REveBoxSet();
+  if (!heatmap) {
+    boxset->UseSingleColor();
+    boxset->SetMainColor(itemColor);
+    boxset->SetMainColorPtr(new Color_t);
+  }
+  boxset->SetPickable(true);
+  boxset->Reset(REveBoxSet::kBT_FreeBox, true, 64);
+  boxset->SetAntiFlick(true);
+
+  auto geom = fireworks::Context::getInstance()->getGeom();
+
+
+  for (const auto &it : iData.hits_and_fractions()) {
+    if (heatmap && m_hitmap.find(it.first) == m_hitmap.end())
+      continue;
+
+    const bool z = (it.first >> 25) & 0x1;
+
+    // discard everything thats not at the side that we are intersted in
+    if (((z_plus & z_minus) != 1) && (((z_plus | z_minus) == 0) || !(z == z_minus || z == !z_plus)))
+      continue;
+
+    const float *corners = geom->getCorners(it.first);
+    const float *parameters = geom->getParameters(it.first);
+    const float *shapes = geom->getShapePars(it.first);
+
+    if (corners == nullptr || parameters == nullptr || shapes == nullptr) {
+      continue;
+    }
+
+    const int total_points = parameters[0];
+    const bool isScintillator = (total_points == 4);
+    const uint8_t type = ((it.first >> 28) & 0xF);
+
+    uint8_t ll = layer;
+    if (layer > 0) {
+      if (layer > 28) {
+        if (type == 8) {
+          continue;
+        }
+        ll -= 28;
+      } else {
+        if (type != 8) {
+          continue;
+        }
+      }
+
+      if (ll != ((it.first >> (isScintillator ? 17 : 20)) & 0x1F))
+        continue;
+    }
+
+    // Scintillator
+    if (isScintillator) {
+      const int total_vertices = 3 * total_points;
+
+      std::vector<float> pnts(24);
+      for (int i = 0; i < total_points; ++i) {
+        pnts[i * 3 + 0] = corners[i * 3];
+        pnts[i * 3 + 1] = corners[i * 3 + 1];
+        pnts[i * 3 + 2] = corners[i * 3 + 2];
+
+        pnts[(i * 3 + 0) + total_vertices] = corners[i * 3];
+        pnts[(i * 3 + 1) + total_vertices] = corners[i * 3 + 1];
+        pnts[(i * 3 + 2) + total_vertices] = corners[i * 3 + 2] + shapes[3];
+      }
+      boxset->AddBox(&pnts[0]);
+      if (heatmap) {
+        const uint8_t colorFactor = FWHGCAL_GRADIENT_STEPS * (fmin(m_hitmap.at(it.first)->energy() / saturation_energy, 1.0f));
+        boxset->DigitColor(fwhgcal::gradient[0][colorFactor], fwhgcal::gradient[1][colorFactor], fwhgcal::gradient[2][colorFactor]);
+      }
+
+      h_box = true;
+    }
+    // Silicon
+    else {
+      const int offset = 9;
+
+      float centerX = (corners[6] + corners[6 + offset]) / 2;
+      float centerY = (corners[7] + corners[7 + offset]) / 2;
+      float radius = fabs(corners[6] - corners[6 + offset]) / 2;
+      // hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, shapes[2], shapes[3]);
+      /* The AddHex function angle seems to make a rotation around (0,0,0) (to be verified).  (REveBoxSet::AddHex(const REveVector& pos, Float_t r, Float_t angle, Float_t depth) https://root.cern/doc/v638/REveBoxSet_8cxx_source.html#l00228 )
+        While we want to make a rotation around the center of the hexagon.
+        For now set the angle to 0 (the hexagon will not have the correct rotation but its center will be in the correct location).
+        TODO do the rotation properly.
+        */
+      hex_boxset->AddHex(REveVector(centerX, centerY, corners[2]), radius, 0., shapes[3]);
+      if (heatmap) {
+        const uint8_t colorFactor = FWHGCAL_GRADIENT_STEPS * (fmin(m_hitmap.at(it.first)->energy() / saturation_energy, 1.0f));
+        hex_boxset->DigitColor(fwhgcal::gradient[0][colorFactor], fwhgcal::gradient[1][colorFactor], fwhgcal::gradient[2][colorFactor]);
+      }
+
+      h_hex = true;
+    }
+  }
+
+
+  if (h_hex) {
+    hex_boxset->RefitPlex();
+    SetupAddElement(hex_boxset, oItemHolder);
+  }
+
+  if (h_box) {
+    boxset->RefitPlex();
+    SetupAddElement(boxset, oItemHolder);
+  }
+}
+
+REGISTER_FW2PROXYBUILDER(FWSimClusterProxyBuilder, SimCluster, "SimCluster");