Revision d7a041971d224681ae21de6feeb5fcf82f71a631 authored by Carsten Burgard on 15 December 2023, 15:25:58 UTC, committed by Jonas Rembser on 19 December 2023, 22:02:43 UTC
In the current implementation, shapesys with no valid data (all constraints constant) are written out in an invalid way, making it impossible for the reader to then instantiate the correct number of parameters. This PR fixes this by forcing the write-out of data with all-zeros for such invalid shapesys. Alternatively, one could imagine dropping these shapesys completely, but that's maybe something of a policy decision that I don't want to make in a bugfix patch :)
1 parent 8f21f0b
TGeoPcon.h
// @(#)root/geom:$Id$
// Author: Andrei Gheata 24/10/01
/*************************************************************************
* Copyright (C) 1995-2000, Rene Brun and Fons Rademakers. *
* All rights reserved. *
* *
* For the licensing terms see $ROOTSYS/LICENSE. *
* For the list of contributors see $ROOTSYS/README/CREDITS. *
*************************************************************************/
#ifndef ROOT_TGeoPcon
#define ROOT_TGeoPcon
#include "TGeoBBox.h"
class TGeoPcon : public TGeoBBox {
protected:
// data members
Int_t fNz = 0; // number of z planes (at least two)
Double_t fPhi1 = 0; // lower phi limit (converted to [0,2*pi)
Double_t fDphi = 0; // phi range
Double_t *fRmin = nullptr; //[fNz] pointer to array of inner radii
Double_t *fRmax = nullptr; //[fNz] pointer to array of outer radii
Double_t *fZ = nullptr; //[fNz] pointer to array of Z planes positions
Bool_t fFullPhi = false; //! Full phi range flag
Double_t fC1 = 0; //! Cosine of phi1
Double_t fS1 = 0; //! Sine of phi1
Double_t fC2 = 0; //! Cosine of phi1+dphi
Double_t fS2 = 0; //! Sine of phi1+dphi
Double_t fCm = 0; //! Cosine of (phi1+phi2)/2
Double_t fSm = 0; //! Sine of (phi1+phi2)/2
Double_t fCdphi = 0; //! Cosine of dphi
// methods
TGeoPcon(const TGeoPcon &) = delete;
TGeoPcon &operator=(const TGeoPcon &) = delete;
Bool_t HasInsideSurface() const;
void SetSegsAndPolsNoInside(TBuffer3D &buff) const;
public:
// constructors
TGeoPcon();
TGeoPcon(const char *name) : TGeoBBox(name, 0, 0, 0) {}
TGeoPcon(Double_t phi, Double_t dphi, Int_t nz);
TGeoPcon(const char *name, Double_t phi, Double_t dphi, Int_t nz);
TGeoPcon(Double_t *params);
// destructor
~TGeoPcon() override;
// methods
Double_t Capacity() const override;
void ComputeBBox() override;
void ComputeNormal(const Double_t *point, const Double_t *dir, Double_t *norm) override;
void ComputeNormal_v(const Double_t *points, const Double_t *dirs, Double_t *norms, Int_t vecsize) override;
Bool_t Contains(const Double_t *point) const override;
void Contains_v(const Double_t *points, Bool_t *inside, Int_t vecsize) const override;
virtual void DefineSection(Int_t snum, Double_t z, Double_t rmin, Double_t rmax);
Double_t DistFromInside(const Double_t *point, const Double_t *dir, Int_t iact = 1, Double_t step = TGeoShape::Big(),
Double_t *safe = nullptr) const override;
void DistFromInside_v(const Double_t *points, const Double_t *dirs, Double_t *dists, Int_t vecsize,
Double_t *step) const override;
Double_t DistFromOutside(const Double_t *point, const Double_t *dir, Int_t iact = 1,
Double_t step = TGeoShape::Big(), Double_t *safe = nullptr) const override;
void DistFromOutside_v(const Double_t *points, const Double_t *dirs, Double_t *dists, Int_t vecsize,
Double_t *step) const override;
Double_t DistToSegZ(const Double_t *point, const Double_t *dir, Int_t &iz) const;
Int_t DistancetoPrimitive(Int_t px, Int_t py) override;
TGeoVolume *
Divide(TGeoVolume *voldiv, const char *divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step) override;
const char *GetAxisName(Int_t iaxis) const override;
Double_t GetAxisRange(Int_t iaxis, Double_t &xlo, Double_t &xhi) const override;
void GetBoundingCylinder(Double_t *param) const override;
const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFrame) const override;
Int_t GetByteCount() const override { return 60 + 12 * fNz; }
Double_t GetPhi1() const { return fPhi1; }
Double_t GetDphi() const { return fDphi; }
Int_t GetNz() const { return fNz; }
virtual Int_t GetNsegments() const;
Double_t *GetRmin() const { return fRmin; }
Double_t GetRmin(Int_t ipl) const;
Double_t *GetRmax() const { return fRmax; }
Double_t GetRmax(Int_t ipl) const;
Double_t *GetZ() const { return fZ; }
Double_t GetZ(Int_t ipl) const;
TGeoShape *GetMakeRuntimeShape(TGeoShape * /*mother*/, TGeoMatrix * /*mat*/) const override { return nullptr; }
Int_t GetNmeshVertices() const override;
Bool_t GetPointsOnSegments(Int_t /*npoints*/, Double_t * /*array*/) const override { return kFALSE; }
void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t &npols) const override;
void InspectShape() const override;
Bool_t IsCylType() const override { return kTRUE; }
TBuffer3D *MakeBuffer3D() const override;
Double_t &Phi1() { return fPhi1; }
Double_t &Dphi() { return fDphi; }
Double_t &Rmin(Int_t ipl) { return fRmin[ipl]; }
Double_t &Rmax(Int_t ipl) { return fRmax[ipl]; }
Double_t &Z(Int_t ipl) { return fZ[ipl]; }
Double_t Safety(const Double_t *point, Bool_t in = kTRUE) const override;
void Safety_v(const Double_t *points, const Bool_t *inside, Double_t *safe, Int_t vecsize) const override;
Double_t
SafetyToSegment(const Double_t *point, Int_t ipl, Bool_t in = kTRUE, Double_t safmin = TGeoShape::Big()) const;
void SavePrimitive(std::ostream &out, Option_t *option = "") override;
void SetDimensions(Double_t *param) override;
void SetPoints(Double_t *points) const override;
void SetPoints(Float_t *points) const override;
void SetSegsAndPols(TBuffer3D &buff) const override;
void Sizeof3D() const override;
ClassDefOverride(TGeoPcon, 1) // polycone class
};
#endif
Computing file changes ...
