Cling template ids

geom/geom/src/TGeoManager.cxx

@@ -2917,7 +2917,7 @@ TVirtualGeoPainter *TGeoManager::GetGeomPainter()
 {
    if (!fPainter) {
       const char *kind = gEnv->GetValue("GeomPainter.Name", "");
-      if (!kind || !*kind);
+      if (!kind || !*kind)
          kind = (gROOT->IsWebDisplay() && !gROOT->IsWebDisplayBatch()) ? "web" : "root";
       if (auto h = gROOT->GetPluginManager()->FindHandler("TVirtualGeoPainter", kind)) {
          if (h->LoadPlugin() == -1) {

interpreter/cling/lib/Utils/ParserStateRAII.cpp

@@ -50,10 +50,13 @@ cling::ParserStateRAII::~ParserStateRAII() {
   // Note: Consuming the EOF token will pop the include stack.
   //
   {
-    // Cleanup the TemplateIds before swapping the previous set back.
-    Parser::DestroyTemplateIdAnnotationsRAIIObj CleanupTemplateIds(*P);
+    // Forcefully clean up the TemplateIds, ignoring additional checks in
+    // MaybeDestroyTemplateIds called from DestroyTemplateIdAnnotationsRAIIObj,
+    // before swapping the previous set back.
+    P->DestroyTemplateIds();
   }
   P->TemplateIds.swap(OldTemplateIds);
+  assert(OldTemplateIds.empty());
   if (SkipToEOF)
     P->SkipUntil(tok::eof);
   else

js/build/jsroot.js

@@ -11,7 +11,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '26/07/2024',
+version_date = '30/07/2024',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -64433,24 +64433,33 @@ const TooltipHandler = {
             case 3: this.zoom_curr[1] = m[1]; changed[0] = false; break; // only Y
          }
 
-         const idx = this.swap_xy ? 1 : 0, idy = 1 - idx;
          let xmin, xmax, ymin, ymax, isany = false,
              namex = 'x', namey = 'y';
 
-         if (changed[idx] && (Math.abs(this.zoom_curr[idx] - this.zoom_origin[idx]) > 10)) {
-            if (this.zoom_second && (this.zoom_kind === 2)) namex = 'x2';
-            xmin = Math.min(this.revertAxis(namex, this.zoom_origin[idx]), this.revertAxis(namex, this.zoom_curr[idx]));
-            xmax = Math.max(this.revertAxis(namex, this.zoom_origin[idx]), this.revertAxis(namex, this.zoom_curr[idx]));
+         if (changed[0] && (Math.abs(this.zoom_curr[0] - this.zoom_origin[0]) > 5)) {
+            if (this.zoom_second && (this.zoom_kind === 2))
+               namex = 'x2';
+            const v1 = this.revertAxis(namex, this.zoom_origin[0]),
+                  v2 = this.revertAxis(namex, this.zoom_curr[0]);
+            xmin = Math.min(v1, v2);
+            xmax = Math.max(v1, v2);
             isany = true;
          }
 
-         if (changed[idy] && (Math.abs(this.zoom_curr[idy] - this.zoom_origin[idy]) > 10)) {
-            if (this.zoom_second && (this.zoom_kind === 3)) namey = 'y2';
-            ymin = Math.min(this.revertAxis(namey, this.zoom_origin[idy]), this.revertAxis(namey, this.zoom_curr[idy]));
-            ymax = Math.max(this.revertAxis(namey, this.zoom_origin[idy]), this.revertAxis(namey, this.zoom_curr[idy]));
+         if (changed[1] && (Math.abs(this.zoom_curr[1] - this.zoom_origin[1]) > 5)) {
+            if (this.zoom_second && (this.zoom_kind === 3))
+               namey = 'y2';
+
+            const v1 = this.revertAxis(namey, this.zoom_origin[1]),
+                  v2 = this.revertAxis(namey, this.zoom_curr[1]);
+            ymin = Math.min(v1, v2);
+            ymax = Math.max(v1, v2);
             isany = true;
          }
 
+         if (this.swap_xy && !this.zoom_second)
+            [xmin, xmax, ymin, ymax] = [ymin, ymax, xmin, xmax];
+
          if (namex === 'x2') {
             pr = this.zoomSingle(namex, xmin, xmax, true);
             kind = 0;

js/modules/core.mjs

@@ -4,7 +4,7 @@ const version_id = 'dev',
 
 /** @summary version date
   * @desc Release date in format day/month/year like '14/04/2022' */
-version_date = '26/07/2024',
+version_date = '30/07/2024',
 
 /** @summary version id and date
   * @desc Produced by concatenation of {@link version_id} and {@link version_date}

js/modules/gpad/TFramePainter.mjs

@@ -1129,24 +1129,33 @@ const TooltipHandler = {
             case 3: this.zoom_curr[1] = m[1]; changed[0] = false; break; // only Y
          }
 
-         const idx = this.swap_xy ? 1 : 0, idy = 1 - idx;
          let xmin, xmax, ymin, ymax, isany = false,
              namex = 'x', namey = 'y';
 
-         if (changed[idx] && (Math.abs(this.zoom_curr[idx] - this.zoom_origin[idx]) > 10)) {
-            if (this.zoom_second && (this.zoom_kind === 2)) namex = 'x2';
-            xmin = Math.min(this.revertAxis(namex, this.zoom_origin[idx]), this.revertAxis(namex, this.zoom_curr[idx]));
-            xmax = Math.max(this.revertAxis(namex, this.zoom_origin[idx]), this.revertAxis(namex, this.zoom_curr[idx]));
+         if (changed[0] && (Math.abs(this.zoom_curr[0] - this.zoom_origin[0]) > 5)) {
+            if (this.zoom_second && (this.zoom_kind === 2))
+               namex = 'x2';
+            const v1 = this.revertAxis(namex, this.zoom_origin[0]),
+                  v2 = this.revertAxis(namex, this.zoom_curr[0]);
+            xmin = Math.min(v1, v2);
+            xmax = Math.max(v1, v2);
             isany = true;
          }
 
-         if (changed[idy] && (Math.abs(this.zoom_curr[idy] - this.zoom_origin[idy]) > 10)) {
-            if (this.zoom_second && (this.zoom_kind === 3)) namey = 'y2';
-            ymin = Math.min(this.revertAxis(namey, this.zoom_origin[idy]), this.revertAxis(namey, this.zoom_curr[idy]));
-            ymax = Math.max(this.revertAxis(namey, this.zoom_origin[idy]), this.revertAxis(namey, this.zoom_curr[idy]));
+         if (changed[1] && (Math.abs(this.zoom_curr[1] - this.zoom_origin[1]) > 5)) {
+            if (this.zoom_second && (this.zoom_kind === 3))
+               namey = 'y2';
+
+            const v1 = this.revertAxis(namey, this.zoom_origin[1]),
+                  v2 = this.revertAxis(namey, this.zoom_curr[1]);
+            ymin = Math.min(v1, v2);
+            ymax = Math.max(v1, v2);
             isany = true;
          }
 
+         if (this.swap_xy && !this.zoom_second)
+            [xmin, xmax, ymin, ymax] = [ymin, ymax, xmin, xmax];
+
          if (namex === 'x2') {
             pr = this.zoomSingle(namex, xmin, xmax, true);
             kind = 0;

tree/ntuple/v7/inc/ROOT/RColumn.hxx

@@ -75,8 +75,15 @@ private:
    NTupleSize_t fFirstElementIndex = 0;
    /// Used to pack and unpack pages on writing/reading
    std::unique_ptr<RColumnElementBase> fElement;
+   /// The column team is a set of columns that serve the same column index for different representation IDs.
+   /// Initially, the team has only one member, the very column it belongs to. Through MergeTeams(), two columns
+   /// can join forces. The team is used to react on suppressed columns: if the current team member has a suppressed
+   /// column for a MapPage() call, it get the page from the active column in the corresponding cluster.
+   std::vector<RColumn *> fTeam;
+   /// Points into fTeam to the column that successfully returned the last page.
+   std::size_t fLastGoodTeamIdx = 0;
 
-   RColumn(EColumnType type, std::uint32_t index);
+   RColumn(EColumnType type, std::uint32_t columnIndex, std::uint16_t representationIndex);
 
    /// Used in Append() and AppendV() to handle the case when the main page reached the target size.
    /// If tail page optimization is enabled, switch the pages; the other page has been flushed when
@@ -112,9 +119,9 @@ private:
 
 public:
    template <typename CppT>
-   static std::unique_ptr<RColumn> Create(EColumnType type, std::uint32_t index)
+   static std::unique_ptr<RColumn> Create(EColumnType type, std::uint32_t columnIdx, std::uint16_t representationIdx)
    {
-      auto column = std::unique_ptr<RColumn>(new RColumn(type, index));
+      auto column = std::unique_ptr<RColumn>(new RColumn(type, columnIdx, representationIdx));
       column->fElement = RColumnElementBase::Generate<CppT>(type);
       return column;
    }
@@ -330,8 +337,18 @@ public:
    }
 
    void Flush();
-   void MapPage(const NTupleSize_t index);
-   void MapPage(RClusterIndex clusterIndex);
+   void CommitSuppressed();
+
+   void MapPage(NTupleSize_t globalIndex) { R__ASSERT(TryMapPage(globalIndex)); }
+   void MapPage(RClusterIndex clusterIndex) { R__ASSERT(TryMapPage(clusterIndex)); }
+   bool TryMapPage(NTupleSize_t globalIndex);
+   bool TryMapPage(RClusterIndex clusterIndex);
+
+   bool ReadPageContains(NTupleSize_t globalIndex) const { return fReadPage.Contains(globalIndex); }
+   bool ReadPageContains(RClusterIndex clusterIndex) const { return fReadPage.Contains(clusterIndex); }
+
+   void MergeTeams(RColumn &other);
+
    NTupleSize_t GetNElements() const { return fNElements; }
    RColumnElementBase *GetElement() const { return fElement.get(); }
    EColumnType GetType() const { return fType; }