Merge pull request cms-sw#1914 from alja/7x-tablecfg-nicola

Fireworks fixes -- Fireworks table entries and tooltips for CSCDetId

Author: ktf

CommonTools/Utils/src/findMethod.cc

@@ -88,6 +88,7 @@ namespace reco {
     type = edm::TypeWithDict(type, 0L); // strip const, volatile, c++ ref, ..
 
     pair<edm::FunctionWithDict, bool> mem; mem.second = false;
+    int                               err_fatal = 0;
 
     // suitable members and number of integer->real casts required to get them
     vector<pair<int,edm::FunctionWithDict> > oks;
@@ -103,13 +104,20 @@ namespace reco {
         } else {
            oError = -1*casts;
            //is this a show stopper error?
-           if(fatalErrorCondition(oError)) {
-              return mem;
+           if(fatalErrorCondition(oError) && err_fatal == 0) {
+              err_fatal = oError;
            }
         }
       }
     }
     //std::cout << "At base scope (type " << (type.name()) << ") found " << oks.size() << " methods." << std::endl; 
+
+    if (oks.empty() && err_fatal)
+    {
+       oError = err_fatal;
+       return mem;
+    }
+
     // found at least one method
     if (!oks.empty()) {
         if (oks.size() > 1) {

Fireworks/Core/macros/default.fwc

@@ -1067,16 +1067,6 @@
       <string>phi</string>
       <string>3</string>
     </config>
-    <config name="edm::RangeMap&lt;CSCDetId,edm::OwnVector&lt;CSCSegment,edm::ClonePolicy&lt;CSCSegment&gt; &gt;,edm::ClonePolicy&lt;CSCSegment&gt; &gt;" version="1">
-      <string>number of segments</string>
-      <string>size</string>
-      <string>0</string>
-    </config>
-    <config name="edm::RangeMap&lt;DTChamberId,edm::OwnVector&lt;DTRecSegment4D,edm::ClonePolicy&lt;DTRecSegment4D&gt; &gt;,edm::ClonePolicy&lt;DTRecSegment4D&gt; &gt;" version="1">
-      <string>number of segments</string>
-      <string>size</string>
-      <string>0</string>
-    </config>
     <config name="reco::CaloJet" version="1">
       <string>Pt</string>
       <string>pt</string>
@@ -1305,8 +1295,6 @@
     <config name="typeNames" version="1">
       <string>CaloRecHit</string>
       <string>CaloTower</string>
-      <string>edm::RangeMap&lt;CSCDetId,edm::OwnVector&lt;CSCSegment,edm::ClonePolicy&lt;CSCSegment&gt; &gt;,edm::ClonePolicy&lt;CSCSegment&gt; &gt;</string>
-      <string>edm::RangeMap&lt;DTChamberId,edm::OwnVector&lt;DTRecSegment4D,edm::ClonePolicy&lt;DTRecSegment4D&gt; &gt;,edm::ClonePolicy&lt;DTRecSegment4D&gt; &gt;</string>
       <string>reco::CaloJet</string>
       <string>reco::GenParticle</string>
       <string>reco::GsfElectron</string>

Fireworks/Core/src/FWItemValueGetter.cc

@@ -75,6 +75,19 @@ FWItemValueGetter::FWItemValueGetter(const edm::TypeWithDict& iType, const std::
    {
       addEntry("et", 1);
    }
+   else if ( iPurpose == "DT-segments")
+   {
+      addEntry("chamberId().wheel()", 0, "wh");
+      addEntry("chamberId().station()", 0, "st");
+      addEntry("chamberId().sector()", 0, "sc");
+
+   }
+   else if ( iPurpose == "CSC-segments")
+   {
+      addEntry("cscDetId().endcap()", 0, "ec");
+      addEntry("cscDetId().station()", 0, "st");
+      addEntry("cscDetId().ring()", 0, "rn");
+   }
    else {
       // by the default  add pt, et, or energy
       bool x = addEntry("pt", 1);

Fireworks/Core/src/FWTableViewManager.cc

@@ -126,6 +126,32 @@ FWTableViewManager::FWTableViewManager(FWGUIManager* iGUIMgr)
    column("chi2", 3).
    column("ndof", TableEntry::INT);
 
+   table("DTRecSegment4D").
+   column("wheel", 0, "chamberId.wheel").
+   column("station", 0, "chamberId.station").
+   column("sector", 0, "chamberId.sector").
+   column("t0phi", 2, "phiSegment.t0").
+   column("t0theta", 2, "zSegment.t0").
+   column("hasPhi", -2, "hasPhi").
+   column("hasZed", -2, "hasZed").
+   column("chi2", 2, "chi2").
+   column("dof", 0, "degreesOfFreedom"); 
+
+   table("DTRecHit1DPair").
+   column("wheel", 0, "wireId.wheel").
+   column("station", 0, "wireId.station").
+   column("sector", 0, "wireId.sector").
+   column("SL", 0, "wireId.superlayer").
+   column("layer", 0, "wireId.layer").
+   column("wire", 0, "wireId.wire").
+   column("digiTime", 2, "digiTime");
+
+   table("CSCSegment").
+   column("endcap", 0, "cscDetId.endcap").
+   column("station", 0, "cscDetId.station").
+   column("ring", 0, "cscDetId.ring").
+   column("chamber", 0, "cscDetId.chamber");
+
    table("reco::Vertex").
    column("x", 5).
    column("xError", 5).