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
TGeoCone.h
// @(#)root/geom:$Id$
// Author: Andrei Gheata 31/01/02
/*************************************************************************
* 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_TGeoCone
#define ROOT_TGeoCone
#include "TGeoBBox.h"
class TGeoCone : public TGeoBBox {
protected:
// data members
Double_t fDz; // half length
Double_t fRmin1; // inner radius at -dz
Double_t fRmax1; // outer radius at -dz
Double_t fRmin2; // inner radius at +dz
Double_t fRmax2; // outer radius at +dz
// methods
TGeoCone(const TGeoCone &) = delete;
TGeoCone &operator=(const TGeoCone &) = delete;
public:
// constructors
TGeoCone();
TGeoCone(Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2);
TGeoCone(const char *name, Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2);
TGeoCone(Double_t *params);
// destructor
~TGeoCone() override;
// methods
Double_t Capacity() const override;
static Double_t Capacity(Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2);
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;
static void ComputeNormalS(const Double_t *point, const Double_t *dir, Double_t *norm, Double_t dz, Double_t rmin1,
Double_t rmax1, Double_t rmin2, Double_t rmax2);
Bool_t Contains(const Double_t *point) const override;
void Contains_v(const Double_t *points, Bool_t *inside, Int_t vecsize) const override;
Int_t DistancetoPrimitive(Int_t px, Int_t py) override;
static void DistToCone(const Double_t *point, const Double_t *dir, Double_t dz, Double_t r1, Double_t r2,
Double_t &b, Double_t &delta);
static Double_t DistFromInsideS(const Double_t *point, const Double_t *dir, Double_t dz, Double_t rmin1,
Double_t rmax1, Double_t rmin2, Double_t rmax2);
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;
static Double_t DistFromOutsideS(const Double_t *point, const Double_t *dir, Double_t dz, Double_t rmin1,
Double_t rmax1, Double_t rmin2, Double_t rmax2);
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;
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;
Int_t GetByteCount() const override { return 56; }
const TBuffer3D &GetBuffer3D(Int_t reqSections, Bool_t localFrame) const override;
virtual Double_t GetDz() const { return fDz; }
TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const override;
void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t &npols) const override;
Int_t GetNmeshVertices() const override;
Bool_t GetPointsOnSegments(Int_t npoints, Double_t *array) const override;
virtual Double_t GetRmin1() const { return fRmin1; }
virtual Double_t GetRmax1() const { return fRmax1; }
virtual Double_t GetRmin2() const { return fRmin2; }
virtual Double_t GetRmax2() const { return fRmax2; }
void InspectShape() const override;
Bool_t IsCylType() const override { return kTRUE; }
TBuffer3D *MakeBuffer3D() const override;
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;
static Double_t SafetyS(const Double_t *point, Bool_t in, Double_t dz, Double_t rmin1, Double_t rmax1,
Double_t rmin2, Double_t rmax2, Int_t skipz = 0);
void SavePrimitive(std::ostream &out, Option_t *option = "") override;
void SetConeDimensions(Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2);
void SetDimensions(Double_t *param) override;
void SetPoints(Double_t *points) const override;
void SetPoints(Float_t *points) const override;
void SetSegsAndPols(TBuffer3D &buffer) const override;
void Sizeof3D() const override;
ClassDefOverride(TGeoCone, 1) // conical tube class
};
class TGeoConeSeg : public TGeoCone {
protected:
// data members
Double_t fPhi1; // first phi limit
Double_t fPhi2; // second phi limit
// Transient trigonometric data
Double_t fS1; // sin(phi1)
Double_t fC1; // cos(phi1)
Double_t fS2; // sin(phi2)
Double_t fC2; // cos(phi2)
Double_t fSm; // sin(0.5*(phi1+phi2))
Double_t fCm; // cos(0.5*(phi1+phi2))
Double_t fCdfi; // cos(0.5*(phi1-phi2))
void InitTrigonometry();
public:
// constructors
TGeoConeSeg();
TGeoConeSeg(Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2, Double_t phi1,
Double_t phi2);
TGeoConeSeg(const char *name, Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2,
Double_t phi1, Double_t phi2);
TGeoConeSeg(Double_t *params);
// destructor
~TGeoConeSeg() override;
// methods
void AfterStreamer() override;
Double_t Capacity() const override;
static Double_t
Capacity(Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2, Double_t phi1, Double_t phi2);
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;
static void ComputeNormalS(const Double_t *point, const Double_t *dir, Double_t *norm, Double_t dz, Double_t rmin1,
Double_t rmax1, Double_t rmin2, Double_t rmax2, Double_t c1, Double_t s1, Double_t c2,
Double_t s2);
Bool_t Contains(const Double_t *point) const override;
void Contains_v(const Double_t *points, Bool_t *inside, Int_t vecsize) const override;
Int_t DistancetoPrimitive(Int_t px, Int_t py) override;
static Double_t DistToCons(const Double_t *point, const Double_t *dir, Double_t r1, Double_t z1, Double_t r2,
Double_t z2, Double_t phi1, Double_t phi2);
static Double_t DistFromInsideS(const Double_t *point, const Double_t *dir, Double_t dz, Double_t rmin1,
Double_t rmax1, Double_t rmin2, Double_t rmax2, Double_t c1, Double_t s1,
Double_t c2, Double_t s2, Double_t cm, Double_t sm, Double_t cdfi);
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;
static Double_t DistFromOutsideS(const Double_t *point, const Double_t *dir, Double_t dz, Double_t rmin1,
Double_t rmax1, Double_t rmin2, Double_t rmax2, Double_t c1, Double_t s1,
Double_t c2, Double_t s2, Double_t cm, Double_t sm, Double_t cdfi);
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;
TGeoVolume *
Divide(TGeoVolume *voldiv, const char *divname, Int_t iaxis, Int_t ndiv, Double_t start, Double_t step) 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 64; }
TGeoShape *GetMakeRuntimeShape(TGeoShape *mother, TGeoMatrix *mat) const override;
void GetMeshNumbers(Int_t &nvert, Int_t &nsegs, Int_t &npols) const override;
Int_t GetNmeshVertices() const override;
Bool_t GetPointsOnSegments(Int_t npoints, Double_t *array) const override;
Double_t GetPhi1() const { return fPhi1; }
Double_t GetPhi2() const { return fPhi2; }
void InspectShape() const override;
TBuffer3D *MakeBuffer3D() const override;
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;
static Double_t SafetyS(const Double_t *point, Bool_t in, Double_t dz, Double_t rmin1, Double_t rmax1,
Double_t rmin2, Double_t rmax2, Double_t phi1, Double_t phi2, Int_t skipz = 0);
void SavePrimitive(std::ostream &out, Option_t *option = "") override;
void SetConsDimensions(Double_t dz, Double_t rmin1, Double_t rmax1, Double_t rmin2, Double_t rmax2, Double_t phi1,
Double_t phi2);
void SetDimensions(Double_t *param) override;
void SetPoints(Double_t *points) const override;
void SetPoints(Float_t *points) const override;
void SetSegsAndPols(TBuffer3D &buffer) const override;
void Sizeof3D() const override;
ClassDefOverride(TGeoConeSeg, 2) // conical tube segment class
};
#endif
Computing file changes ...
