gondola 0.11.7__tar.gz → 0.12.0__tar.gz

{gondola-0.11.7 → gondola-0.12.0}/Cargo.lock

@@ -1352,7 +1352,7 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "gondola-core"
-version = "0.11.7"
+version = "0.12.0"
 dependencies = [
  "cfg-if 1.0.0",
  "chrono",

{gondola-0.11.7 → gondola-0.12.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gondola-core"
-version = "0.11.7"
+version = "0.12.0"
 edition = "2024"
 readme = "README.md"
 

{gondola-0.11.7 → gondola-0.12.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gondola
-Version: 0.11.7
+Version: 0.12.0
 Requires-Dist: tqdm>=4.0
 Requires-Dist: numpy>=2.3
 Requires-Dist: matplotlib>=3.10

gondola-0.12.0/publish_to_bluejay.sh

@@ -0,0 +1,4 @@
+#! /bin/sh 
+
+maturin build --release
+scp /srv/gaps/gaps-online-software/gondola-core/rust/gondola-core/target/wheels/gondola-0.11.7-cp311-abi3-manylinux_2_39_x86_64.whl bluejay:gaps-online-software/gander/

{gondola-0.11.7 → gondola-0.12.0}/python/gondola/visual/tof.py

@@ -81,7 +81,7 @@ def plot_hg_lg_hits(h_nhits            : dashi.histogram.hist1d,
     
 #h_nrblnk.line(color='tab:red', label='RB LINK ID')
 
-###############################################
+#--------------------------------------------------------
 
 def tof_projection_xy(paddle_occupancy = {}, 
                       event            = None,
@@ -124,9 +124,10 @@ def tof_projection_xy(paddle_occupancy = {},
     else:
         fig, axs        = plt.subplots(1, 3, figsize=(18, 5), gridspec_kw={'width_ratios': [1, 1, 1]})
     
-    umb_paddles     = db.get_umbrella_paddles()
-    cbe_top_paddles = db.Paddle.objects.filter(panel_id=1)
-    cbe_bot_paddles = db.Paddle.objects.filter(panel_id=2)
+    all_paddles     = _gc.db.TofPaddle.all() 
+    umb_paddles     = [k for k in all_paddles if k.paddle_id > 60 and k.paddle_id < 109]
+    cbe_top_paddles = [k for k in all_paddles if k.panel_id == 1] 
+    cbe_bot_paddles = [k for k in all_paddles if k.panel_id == 2]
     xmin, xmax      = -100,100
     ymin, ymax      = -100,100
     zmin, zmax      = -25, 120
@@ -298,6 +299,496 @@ def tof_projection_xy(paddle_occupancy = {},
 
 #--------------------------------------------------------
 
+def unroll_cbe_sides(paddle_occupancy = {},
+                     event            = None,
+                     cmap             = matplotlib.colormaps['hot'],
+                     paddle_style    = {'edgecolor' : 'w', 'lw' : 0.4},
+                     show_cbar        = True,
+                     indicate_empty   = 'gray'
+                     ):
+    """
+    Project the sides of the cube on xz and yz as well 
+    as add the 'edge' paddles.
+
+    While this plot can show the occupancy of TOF paddles,
+    it can also be 'hijacked' to just highlight certain
+    paddles.
+    
+    # Keyword Arguments:
+        paddle_occupancy : The number of events per paddle
+        event            : Plot a tof event
+        cmap             : Colormap - can be lambda function
+                           to return color value based on 
+                           'occupancy' numbker
+        show_cbar        : Show the colorbar on the figure
+        indicate_empty   : In case we are using this for paddle occupancy,
+                           indicate empty paddles with the given color instead
+                           using a value from the color map. If this behavior is 
+                           not desired, set this to an empty string.
+    """
+    fig, axs  = plt.subplots(1, 4, sharey=True,figsize=(22, 5), gridspec_kw={'width_ratios': [1, 1, 1, 1]})
+    all_paddles = _gc.db.TofPaddle.all() 
+    # normal +X
+    cbe_front = [ k for k in all_paddles if k.panel_id==3]
+    # edge normal +X+Y
+    ep_1      = [ k for k in all_paddles if k.paddle_id==57]
+    # normal +Y
+    cbe_sb    = [ k for k in all_paddles if k.panel_id==4]
+    # endge normal -X+Y
+    ep_2      = [ k for k in all_paddles if k.paddle_id==58]
+    # normal -X 
+    cbe_back  = [ k for k in all_paddles if k.panel_id==5]
+    # edge normal -X-Y
+    ep_3      = [ k for k in all_paddles if k.paddle_id==59]
+    # normal -Y 
+    cbe_bb    = [ k for k in all_paddles if k.panel_id==6]
+    # edge normal +X-Y
+    ep_4      = [ k for k in all_paddles if k.paddle_id==60]
+
+    xmin, xmax = -110,110
+    ymin, ymax = -110,110
+    zmin, zmax = -25, 120
+    title      = 'Relative occupancy, xy projection'
+    
+    if event is not None:
+        # coordinates are in mm
+        hit_pids = [h.paddle_id for h in event.hits]
+        xs = 0.1*np.array([h.x for h in event.hits])
+        ys = 0.1*np.array([h.y for h in event.hits])
+        zs = 0.1*np.array([h.z for h in event.hits])
+        ts = np.array([h.t0 for h in event.hits])
+        en = np.array([h.edep for h in event.hits])
+        cm_norm_pts = plt.Normalize(vmin=min(ts), vmax=max(ts))
+
+    ep = ep_1[0]
+    cbe_front.append(ep_1[0])
+    for pdl in cbe_front:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[0].add_patch(pdl.draw_yz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[0].add_patch(pdl.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[0].add_patch(pdl.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    
+
+    ##for pdl in cbe_front:
+    ##    if paddle_occupancy:
+    ##        color = cmap(paddle_occupancy[pdl.paddle_id])
+    ##        axs[0].add_patch(pdl.draw_yz(fill=True, edgecolor=color, facecolor=color))
+    ##    else:
+    ##        if event is not None:
+    ##            axs[0].add_patch(pdl.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+    ##        else:
+    ##            axs[0].add_patch(pdl.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    
+    if event is not None:
+        #print (hit_pids)
+        cbe_front_pids = [k.paddle_id for k in cbe_front]
+        for h in event.hits:
+        #for j, pdl_hit in enumerate(hit_pids):
+            if h.paddle_id in cbe_front_pids:
+                axs[0].scatter([0.1*h.y], [0.1*h.z], alpha = 0.8 , marker='o', s=100*h.edep,
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(h.t0)))
+    axs[0].set_xlabel('y [cm]', loc='right')
+    axs[0].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    axs[0].set_aspect('equal')
+    axs[0].set_xlim(-80, 90)
+    axs[0].set_ylim(-10, 120)
+    axs[0].set_title('CBE +X', loc='right')
+    
+    # +Y side
+    ep = ep_2[0]
+    cbe_sb.append(ep_2[0])
+    #if paddle_occupancy:
+    #    color = cmap(paddle_occupancy[ep.paddle_id])
+    #    if not paddle_occupancy[ep.paddle_id] and indicate_empty:
+    #        color = indicate_empty
+    #    axs[1].add_patch(ep.draw_xz(fill=True, edgecolor=color, facecolor=color))
+    #else:
+    #    if event is not None:
+    #        axs[1].add_patch(ep.draw_xz(fill=False, facecolor='tab:blue', **paddle_style))
+    #    else:
+    #        axs[1].add_patch(ep.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+
+    for pdl in cbe_sb:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[1].add_patch(pdl.draw_xz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[1].add_patch(pdl.draw_xz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[1].add_patch(pdl.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+   
+    if event is not None:
+        #print (hit_pids)
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [umbp.paddle_id for umbp in cbe_sb]:
+                axs[1].scatter([xs[j]], [ys[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+    axs[1].set_xlabel('x [cm]', loc='right')
+    #axs[1].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    axs[1].set_aspect('equal')
+    axs[1].set_xlim(-90, 80)
+    axs[1].set_ylim(-10, 120)
+    axs[1].set_title('CBE +Y', loc='right')
+    axs[1].invert_xaxis()
+
+    ep = ep_3[0]
+    cbe_back.append(ep_3[0])
+    #if paddle_occupancy:
+    #    color = cmap(paddle_occupancy[ep.paddle_id])
+    #    if not paddle_occupancy[ep.paddle_id] and indicate_empty:
+    #        color = indicate_empty
+    #    axs[2].add_patch(ep.draw_yz(fill=True, edgecolor=color, facecolor=color))
+    #else:
+    #    if event is not None:
+    #        axs[2].add_patch(ep.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+    #    else:
+    #        axs[2].add_patch(ep.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    for pdl in cbe_back:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[2].add_patch(pdl.draw_yz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[2].add_patch(pdl.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[2].add_patch(pdl.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    if event is not None:
+        #print (hit_pids)
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [umbp.paddle_id for umbp in cbe_back]:
+                axs[2].scatter([ys[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+    axs[2].set_xlabel('y [cm]', loc='right')
+    #axs[2].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    axs[2].set_xlim(-90, 80)
+    axs[2].set_ylim(-10, 120)
+    axs[2].set_aspect('equal')
+    axs[2].invert_xaxis()
+    axs[2].set_title('CBE -X', loc='right')
+    
+    # -Y side
+    ep = ep_4[0]
+    cbe_bb.append(ep_4[0])
+    #if paddle_occupancy:
+    #    color = cmap(paddle_occupancy[ep.paddle_id])
+    #    if not paddle_occupancy[ep.paddle_id] and indicate_empty:
+    #        color = indicate_empty
+    #    axs[3].add_patch(ep.draw_xz(fill=True, edgecolor=color, facecolor=color))
+    #else:
+    #    if event is not None:
+    #        axs[3].add_patch(ep.draw_xz(fill=False, edgecolor='k', facecolor='tab:blue', alpha=0.3))
+    #    else:
+    #        axs[3].add_patch(ep.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+    for pdl in cbe_bb:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[3].add_patch(pdl.draw_xz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[3].add_patch(pdl.draw_xz(fill=False,facecolor='tab:blue', **paddle_style))
+            else:
+                axs[3].add_patch(pdl.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+    if event is not None:
+        #print (hit_pids)
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [umbp.paddle_id for umbp in cbe_bb]:
+                axs[3].scatter([xs[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+
+    axs[3].set_xlabel('x [cm]', loc='right')
+    #axs[3].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    axs[3].set_aspect('equal')
+    axs[3].set_xlim(-80, 90)
+    axs[3].set_ylim(-10, 120)
+    axs[3].set_title('CBE +Y', loc='right')
+    #axs[3].invert_xaxis()
+
+    axs[0].spines['top'].set_visible(True)
+    axs[1].spines['top'].set_visible(True)
+    axs[2].spines['top'].set_visible(True)
+    axs[3].spines['top'].set_visible(True)
+    axs[0].spines['right'].set_visible(True)
+    axs[1].spines['right'].set_visible(True)
+    axs[2].spines['right'].set_visible(True)
+    axs[3].spines['right'].set_visible(True)
+    
+    plt.subplots_adjust(wspace=0)
+    
+    if paddle_occupancy and show_cbar:
+        cbar_ax = fig.add_axes([0.9, 0.0, 0.05, 1.0])
+        cbar_ax.set_axis_off()
+        sm = cm.ScalarMappable(cmap=cmap, norm=matplotlib.colors.Normalize())
+        sm.set_array([0, 1])
+        ax = plt.sca(cbar_ax)
+        plt.colorbar(sm, ax=cbar_ax, label='Relative occupancy')
+        fig.suptitle(title, x=0.9)
+    return fig, axs
+
+#--------------------------------------------------------
+
+def unroll_cor(paddle_occupancy = {},
+               event            = None,
+               cmap             = matplotlib.colormaps['hot'],
+               paddle_style     = {'edgecolor' : 'w', 'lw' : 0.4},
+               show_cbar        = True,
+               indicate_empty   = 'gray'):
+    """
+    Project the cortina on xz and yz as well 
+    as add the 'edge' paddles.
+
+    While this plot can show the occupancy of TOF paddles,
+    it can also be 'hijacked' to just highlight certain
+    paddles.
+    
+    # Keyword Arguments:
+        paddle_occupancy : The number of events per paddle
+        cmap             : Colormap - can be lambda function
+                           to return color value based on 
+                           'occupancy' numbker
+        show_cbar        : Show the colorbar on the figure
+        indicate_empty   : In case we are using this for paddle occupancy,
+                           indicate empty paddles with the given color instead
+                           using a value from the color map. If this behavior is 
+                           not desired, set this to an empty string.
+    """
+    fig, axs  = plt.subplots(1, 4, sharey=True, figsize=(22, 5), gridspec_kw={'width_ratios': [1, 1, 1, 1]})
+    all_paddles = _gc.db.TofPaddle.all()
+    # normal +X
+    cor_front = [k for k in all_paddles if k.panel_id==14]
+    # edge normal +X+Y
+    ep_1      = [k for k in all_paddles if k.panel_id==18]
+    # normal +Y
+    cor_sb    = [k for k in all_paddles if k.panel_id==15]
+    # endge normal -X+Y
+    ep_2      = [k for k in all_paddles if k.panel_id==19]
+    # normal -X 
+    cor_back  = [k for k in all_paddles if k.panel_id==16] 
+    # edge normal -X-Y
+    ep_3      = [k for k in all_paddles if k.panel_id==20]
+    # normal -Y 
+    cor_bb    = [k for k in all_paddles if k.panel_id==17]
+    # edge normal +X-Y
+    ep_4      = [k for k in all_paddles if k.panel_id==21]
+
+    xmin, xmax = -100,130
+    ymin, ymax = -25,175 # these are the z-coordinates
+    title      = 'Relative occupancy, xy projection'
+    
+    if event is not None:
+        # coordinates are in mm
+        event_hits = sorted(event.hits, key=lambda x : x.t0)
+        hit_pids = [h.paddle_id for h in event_hits]
+        xs = 0.1*np.array([h.x for h in event_hits])
+        ys = 0.1*np.array([h.y for h in event_hits])
+        zs = 0.1*np.array([h.z for h in event_hits])
+        ts = np.array([h.t0 for h in event_hits])
+        en = np.array([h.edep for h in event_hits])
+        cm_norm_pts = plt.Normalize(vmin=min(ts), vmax=max(ts))
+    
+    for ep in ep_1:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[ep.paddle_id])
+            if not paddle_occupancy[ep.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[0].add_patch(ep.draw_yz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[0].add_patch(ep.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[0].add_patch(ep.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in ep_1]:
+                axs[0].scatter([ys[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+
+    for pdl in cor_front:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[0].add_patch(pdl.draw_yz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[0].add_patch(pdl.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[0].add_patch(pdl.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in cor_front]:
+                axs[0].scatter([ys[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+
+    axs[0].set_xlabel('y [cm]', loc='right')
+    axs[0].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    #axs[0].set_aspect('equal')
+    axs[0].set_xlim(xmin, xmax)
+    axs[0].set_ylim(ymin, ymax)
+    axs[0].set_title('COR +X', loc='right')
+    
+    # +Y side
+    for ep in ep_2:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[ep.paddle_id])
+            if not paddle_occupancy[ep.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[1].add_patch(ep.draw_xz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[1].add_patch(ep.draw_xz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[1].add_patch(ep.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in ep_2]:
+                axs[1].scatter([xs[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                                lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+
+    for pdl in cor_sb:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[1].add_patch(pdl.draw_xz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[1].add_patch(pdl.draw_xz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[1].add_patch(pdl.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in cor_sb]:
+                axs[1].scatter([zs[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+    axs[1].set_xlabel('x [cm]', loc='right')
+    #axs[1].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    #axs[1].set_aspect('equal')
+    axs[1].set_xlim(-1*xmax, -1*xmin)
+    axs[1].set_ylim(ymin, ymax)
+    axs[1].set_title('COR +Y', loc='right')
+    axs[1].invert_xaxis()
+
+    for ep in ep_3:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[ep.paddle_id])
+            if not paddle_occupancy[ep.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[2].add_patch(ep.draw_yz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[2].add_patch(ep.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[2].add_patch(ep.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in ep_3]:
+                axs[2].scatter([ys[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+    
+    for pdl in cor_back:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[2].add_patch(pdl.draw_yz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[2].add_patch(pdl.draw_yz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[2].add_patch(pdl.draw_yz(fill=True, edgecolor='k', facecolor='w'))
+    
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in cor_back]:
+                axs[2].scatter([ys[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+    axs[2].set_xlabel('y [cm]', loc='right')
+    #axs[2].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    axs[2].set_xlim(-1*xmax, -1*xmin)
+    axs[2].set_ylim(ymin, ymax)
+    #axs[2].set_aspect('equal')
+    axs[2].invert_xaxis()
+    axs[2].set_title('COR -X', loc='right')
+    
+    # -Y side
+    for ep in ep_4:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[ep.paddle_id])
+            if not paddle_occupancy[ep.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[3].add_patch(ep.draw_xz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[3].add_patch(ep.draw_xz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[3].add_patch(ep.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in ep_4]:
+                axs[3].scatter([xs[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+
+    for pdl in cor_bb:
+        if paddle_occupancy:
+            color = cmap(paddle_occupancy[pdl.paddle_id])
+            if not paddle_occupancy[pdl.paddle_id] and indicate_empty:
+                color = indicate_empty
+            axs[3].add_patch(pdl.draw_xz(fill=True, edgecolor=color, facecolor=color))
+        else:
+            if event is not None:
+                axs[3].add_patch(pdl.draw_xz(fill=False, facecolor='tab:blue', **paddle_style))
+            else:
+                axs[3].add_patch(pdl.draw_xz(fill=True, edgecolor='k', facecolor='w'))
+    
+    if event is not None:
+        for j, pdl_hit in enumerate(hit_pids):
+            if pdl_hit in [pdl_.paddle_id for pdl_ in cor_bb]:
+                axs[3].scatter([xs[j]], [zs[j]], alpha = 0.8 , marker='o', s=100*en[j],
+                               lw=1.5, edgecolor='k', color=cmap(cm_norm_pts(ts[j])))
+    
+    axs[3].set_xlabel('x [cm]', loc='right')
+    #axs[3].set_ylabel('z [cm]', loc='top')#, rotation=90)
+    #axs[3].set_aspect('equal')
+    axs[3].set_xlim(xmin, xmax)
+    axs[3].set_ylim(ymin, ymax)
+    axs[3].set_title('COR +Y', loc='right')
+    #axs[3].invert_xaxis()
+
+    axs[0].spines['top'].set_visible(True)
+    axs[1].spines['top'].set_visible(True)
+    axs[2].spines['top'].set_visible(True)
+    axs[3].spines['top'].set_visible(True)
+    axs[0].spines['right'].set_visible(True)
+    axs[1].spines['right'].set_visible(True)
+    axs[2].spines['right'].set_visible(True)
+    axs[3].spines['right'].set_visible(True)
+    
+    plt.subplots_adjust(wspace=0)
+
+    if paddle_occupancy and show_cbar:
+        cbar_ax = fig.add_axes([0.9, 0.0, 0.05, 1.0])
+        cbar_ax.set_axis_off()
+        sm = cm.ScalarMappable(cmap=cmap, norm=matplotlib.colors.Normalize())
+        sm.set_array([0, 1])
+        ax = plt.sca(cbar_ax)
+        plt.colorbar(sm, ax=cbar_ax, label='Relative occupancy')
+        fig.suptitle(title, x=0.9)
+    return fig, axs
+
 def tof_2dproj(event            = None,
                cmap             = matplotlib.colormaps['seismic'],
                paddle_style     = {'edgecolor' : 'w', 'lw' : 0.4},

{gondola-0.11.7 → gondola-0.12.0}/src/calibration/tof.rs

@@ -9,7 +9,7 @@ use crate::prelude::*;
 /// to the beginning by a given offset.
 /// 
 /// This is similar to 
-/// https://numpy.org/doc/2.2/reference/generated/numpy.roll.html
+/// <https://numpy.org/doc/2.2/reference/generated/numpy.roll.html>
 ///
 /// # Arguments:
 ///   * `vec`   : The vector to be rolled over. It will 
@@ -1782,6 +1782,7 @@ impl RBCalibrations {
   }
 }
 
+#[cfg(feature = "pybindings")]
 pythonize_packable_no_new!(RBCalibrations);
 
 #[cfg(feature = "random")]

{gondola-0.11.7 → gondola-0.12.0}/src/events/rb_waveform.rs

@@ -3,7 +3,6 @@
 
 use crate::prelude::*;
 
-
 /// Waveform container for Tof waveforms
 /// This holds the waveforms for both 
 /// paddle ends. Fields are available to 
@@ -14,13 +13,16 @@ use crate::prelude::*;
 pub struct RBWaveform {
   pub event_id      : u32,
   pub rb_id         : u8,
-  /// FIXME - this is form 0-8, but should it be from 1-9?
+  ///// FIXME - this is form 0-8, but should it be from 1-9?
   pub rb_channel_a  : u8,
   pub rb_channel_b  : u8,
   /// DRS4 stop cell
   pub stop_cell     : u16,
   pub adc_a         : Vec<u16>,
   pub adc_b         : Vec<u16>,
+  // FIXME - to be compatible with Antarctica data from 
+  // 2024/25, we do not serialize the paddle id in this version
+  // HOWEVER, let's change that in v0.12
   pub paddle_id     : u8,
   pub voltages_a    : Vec<f32>,
   pub nanoseconds_a : Vec<f32>,
@@ -238,6 +240,9 @@ impl Serialization for RBWaveform {
     let data_a           = &stream[*pos..*pos+2*NWORDS];
     wf.adc_a             = u8_to_u16(data_a);
     *pos += 2*NWORDS;
+    if stream.len() < *pos+2*NWORDS {
+      return Err(SerializationError::StreamTooShort);
+    }
     let data_b           = &stream[*pos..*pos+2*NWORDS];
     wf.adc_b             = u8_to_u16(data_b);
     *pos += 2*NWORDS;
@@ -449,6 +454,10 @@ impl RBWaveform {
 #[cfg(feature="pybindings")]
 pythonize_packable!(RBWaveform);
 
+// needs to fix something up
+//#[cfg(feature="pybindings")]
+//pythonize_telemetry!(RBWaveform);
+
 //---------------------------------------------------
 
 #[cfg(feature = "random")]

{gondola-0.11.7 → gondola-0.12.0}/src/events/tof_event.rs

@@ -319,7 +319,7 @@ impl TofEvent {
       h.event_t0 = t0 + t_shift;
     }
     // start the first hit at 0
-    self.hits.sort_by(|a,b| (a.event_t0).partial_cmp(&b.event_t0).unwrap());
+    self.hits.sort_by(|a,b| (a.event_t0).partial_cmp(&b.event_t0).unwrap_or(Ordering::Greater));
     let t0_first_hit = self.hits[0].event_t0;
     for h in self.hits.iter_mut() {
       h.event_t0 -= t0_first_hit
@@ -428,8 +428,6 @@ impl TofEvent {
   ///   Vec<(hit)> where hit is (DSI, J, CH) 
   pub fn get_trigger_hits(&self) -> Vec<(u8, u8, (u8, u8), LTBThreshold)> {
     let mut hits = Vec::<(u8,u8,(u8,u8),LTBThreshold)>::with_capacity(5); 
-    let physical_channels = [(1u8,  2u8), (3u8,4u8), (5u8, 6u8), (7u8, 8u8),
-                             (9u8, 10u8), (11u8,12u8), (13u8, 14u8), (15u8, 16u8)];
     //let n_masks_needed = self.dsi_j_mask.count_ones() / 2 + self.dsi_j_mask.count_ones() % 2;
     let n_masks_needed = self.dsi_j_mask.count_ones();
     if self.channel_mask.len() < n_masks_needed as usize {
@@ -469,7 +467,7 @@ impl TofEvent {
         let channels = self.channel_mask[n_mask]; 
         for (i,ch) in LTB_CHANNELS.iter().enumerate() {
           //let chn = *ch as u8 + 1;
-          let ph_chn = physical_channels[i];
+          let ph_chn = PHYSICAL_CHANNELS[i];
           //let chn = i as u8 + 1;
           //println!("i,ch {}, {}", i, ch);
           let thresh_bits = ((channels & ch) >> (i*2)) as u8;

{gondola-0.11.7 → gondola-0.12.0}/src/events/tof_hit.rs

@@ -770,8 +770,8 @@ impl FromRandom for TofHit {
   fn from_random() -> TofHit {
     let mut pp  = TofHit::new();
     let mut rng = rand::rng();
-
-    pp.paddle_id      = rng.random::<u8> ();
+    
+    pp.paddle_id      = rng.random_range(0..161);
     pp.time_a         = f16::from_f32(rng.random::<f32>());
     pp.time_b         = f16::from_f32(rng.random::<f32>());
     pp.peak_a         = f16::from_f32(rng.random::<f32>());

{gondola-0.11.7 → gondola-0.12.0}/src/events.rs

@@ -74,6 +74,11 @@ pub const LTB_CHANNELS : [u16;8] = [
   LTB_CH7
 ];
 
+/// An array of the channel numbers as they come in pairs on the LTB
+pub const PHYSICAL_CHANNELS : [(u8, u8); 8] = [(1u8,  2u8), (3u8,4u8), (5u8, 6u8), (7u8, 8u8),
+                                               (9u8, 10u8), (11u8,12u8), (13u8, 14u8), (15u8, 16u8)];
+
+
 /// Calculate an unique identifier for 
 /// tracker strips from the position in 
 /// the tracker stack

{gondola-0.11.7 → gondola-0.12.0}/src/io/parsers.rs

@@ -134,7 +134,7 @@ pub fn parse_string<T: AsRef<[u8]>>(stream : &T, pos : &mut usize) -> String {
 /// representation of u32 (neither le or be, but 
 /// shuffled)
 /// 
-/// <div class="warning>
+/// <div class="warning">
 /// This assumes an underlying representation of 
 /// an atomic unit of 16bit instead of 8.
 /// This is a non-convetional byte respresentation