diff --git a/DDCore/include/DD4hep/Shapes.h b/DDCore/include/DD4hep/Shapes.h
index 3aaba2e61837df6f21da119abc97ecf1d592e1ed..7cfe5aa5aa0239e60b1d59e7cbb29e9e90c5267c 100644
--- a/DDCore/include/DD4hep/Shapes.h
+++ b/DDCore/include/DD4hep/Shapes.h
@@ -409,6 +409,11 @@ namespace dd4hep {
* \ingroup DD4HEP_CORE
*/
class ConeSegment : public Solid_type<TGeoConeSeg> {
+ void make(const std::string& name,
+ double dz,
+ double rmin1, double rmax1,
+ double rmin2, double rmax2,
+ double startPhi, double endPhi);
public:
/// Default constructor
ConeSegment() = default;
@@ -423,11 +428,34 @@ namespace dd4hep {
/// Constructor to create a new ConeSegment object
ConeSegment(double dz, double rmin1, double rmax1,
- double rmin2, double rmax2, double startPhi = 0.0, double endPhi = 2.0 * M_PI);
-
+ double rmin2, double rmax2, double startPhi = 0.0, double endPhi = 2.0 * M_PI)
+ { make("", dz, rmin1, rmax1, rmin2, rmax2, startPhi, endPhi); }
+ /// Constructor to create a new ConeSegment object
+ template <typename DZ,
+ typename RMIN1, typename RMAX1,
+ typename RMIN2, typename RMAX2,
+ typename STARTPHI, typename ENDPHI>
+ ConeSegment(DZ dz, RMIN1 rmin1, RMAX1 rmax1, RMIN2 rmin2, RMAX2 rmax2,
+ STARTPHI startPhi = 0.0, ENDPHI endPhi = 2.0 * M_PI)
+ { make("", _toDouble(dz),
+ _toDouble(rmin1), _toDouble(rmax1),
+ _toDouble(rmin2), _toDouble(rmax2),
+ _toDouble(startPhi), _toDouble(endPhi)); }
+ /// Constructor to create a new named ConeSegment object
+ ConeSegment(const std::string& nam, double dz, double rmin1, double rmax1,
+ double rmin2, double rmax2, double startPhi = 0.0, double endPhi = 2.0 * M_PI)
+ { make(nam, dz, rmin1, rmax1, rmin2, rmax2, startPhi, endPhi); }
/// Constructor to create a new named ConeSegment object
- ConeSegment(const std::string& name, double dz, double rmin1, double rmax1,
- double rmin2, double rmax2, double startPhi = 0.0, double endPhi = 2.0 * M_PI);
+ template <typename DZ,
+ typename RMIN1, typename RMAX1,
+ typename RMIN2, typename RMAX2,
+ typename STARTPHI, typename ENDPHI>
+ ConeSegment(const std::string& nam, DZ dz, RMIN1 rmin1, RMAX1 rmax1, RMIN2 rmin2, RMAX2 rmax2,
+ STARTPHI startPhi = 0.0, ENDPHI endPhi = 2.0 * M_PI)
+ { make(nam, _toDouble(dz),
+ _toDouble(rmin1), _toDouble(rmax1),
+ _toDouble(rmin2), _toDouble(rmax2),
+ _toDouble(startPhi), _toDouble(endPhi)); }
/// Move Assignment operator
ConeSegment& operator=(ConeSegment&& copy) = default;
@@ -472,25 +500,44 @@ namespace dd4hep {
Tube(double rmin, double rmax, double dz)
{ this->make("", rmin, rmax, dz, 0, 2*M_PI); }
/// Constructor to create a new anonymous tube object with attribute initialization
+ template <typename RMIN, typename RMAX, typename DZ> Tube(RMIN rmin, RMAX rmax, DZ dz)
+ { this->make("", _toDouble(rmin), _toDouble(rmax), _toDouble(dz), 0, 2*M_PI); }
+ /// Constructor to create a new anonymous tube object with attribute initialization
Tube(double rmin, double rmax, double dz, double endPhi)
{ this->make("", rmin, rmax, dz, 0, endPhi); }
/// Constructor to create a new anonymous tube object with attribute initialization
+ template <typename RMIN, typename RMAX, typename DZ, typename ENDPHI>
+ Tube(RMIN rmin, RMAX rmax, DZ dz, ENDPHI endPhi)
+ { this->make("", _toDouble(rmin), _toDouble(rmax), _toDouble(dz), 0, _toDouble(endPhi)); }
+ /// Constructor to create a new anonymous tube object with attribute initialization
Tube(double rmin, double rmax, double dz, double startPhi, double endPhi)
{ this->make("", rmin, rmax, dz, startPhi, endPhi); }
+ /// Constructor to create a new anonymous tube object with attribute initialization
+ template <typename RMIN, typename RMAX, typename DZ, typename STARTPHI, typename ENDPHI>
+ Tube(RMIN rmin, RMAX rmax, DZ dz, STARTPHI startPhi, ENDPHI endPhi)
+ { this->make("", _toDouble(rmin), _toDouble(rmax), _toDouble(dz), _toDouble(startPhi), _toDouble(endPhi)); }
/// Legacy: Constructor to create a new identifiable tube object with attribute initialization
Tube(const std::string& nam, double rmin, double rmax, double dz)
{ this->make(nam, rmin, rmax, dz, 0, 2*M_PI); }
+ /// Constructor to create a new anonymous tube object with attribute initialization
+ template <typename RMIN, typename RMAX, typename DZ>
+ Tube(const std::string& nam, RMIN rmin, RMAX rmax, DZ dz)
+ { this->make(nam, _toDouble(rmin), _toDouble(rmax), _toDouble(dz), 0, 2*M_PI); }
/// Legacy: Constructor to create a new identifiable tube object with attribute initialization
Tube(const std::string& nam, double rmin, double rmax, double dz, double endPhi)
{ this->make(nam, rmin, rmax, dz, 0, endPhi); }
+ /// Constructor to create a new anonymous tube object with attribute initialization
+ template <typename RMIN, typename RMAX, typename DZ, typename ENDPHI>
+ Tube(const std::string& nam, RMIN rmin, RMAX rmax, DZ dz, ENDPHI endPhi)
+ { this->make(nam, _toDouble(rmin), _toDouble(rmax), _toDouble(dz), 0, _toDouble(endPhi)); }
/// Legacy: Constructor to create a new identifiable tube object with attribute initialization
Tube(const std::string& nam, double rmin, double rmax, double dz, double startPhi, double endPhi)
{ this->make(nam, rmin, rmax, dz, startPhi, endPhi); }
/// Constructor to create a new anonymous tube object with attribute initialization
- template <typename RMIN, typename RMAX, typename Z, typename ENDPHI=double>
- Tube(const RMIN& rmin, const RMAX& rmax, const Z& dz, const ENDPHI& endPhi = 2.0*M_PI)
- { this->make("", _toDouble(rmin), _toDouble(rmax), _toDouble(dz), 0, _toDouble(endPhi)); }
+ template <typename RMIN, typename RMAX, typename DZ, typename STARTPHI, typename ENDPHI>
+ Tube(const std::string& nam, RMIN rmin, RMAX rmax, DZ dz, STARTPHI startPhi, ENDPHI endPhi)
+ { this->make(nam, _toDouble(rmin), _toDouble(rmax), _toDouble(dz), _toDouble(startPhi), _toDouble(endPhi)); }
/// Move Assignment operator
Tube& operator=(Tube&& copy) = default;
@@ -1016,11 +1063,11 @@ namespace dd4hep {
template<typename RMIN, typename RMAX,
typename STARTTHETA=double, typename ENDTHETA=double,
typename STARTPHI=double, typename ENDPHI=double>
- Sphere(RMIN rmin, RMAX rmax,
+ Sphere(RMIN rmin, RMAX rmax,
STARTTHETA startTheta = 0.0, ENDTHETA endTheta = M_PI,
STARTPHI startPhi = 0.0, ENDPHI endPhi = 2. * M_PI) {
this->make("",
- _toDOuble(rmin), _toDouble(rmax),
+ _toDouble(rmin), _toDouble(rmax),
_toDouble(startTheta), _toDouble(endTheta),
_toDouble(startPhi), _toDouble(endPhi));
}
@@ -1036,11 +1083,11 @@ namespace dd4hep {
typename STARTTHETA=double, typename ENDTHETA=double,
typename STARTPHI=double, typename ENDPHI=double>
Sphere(const std::string& nam,
- RMIN rmin, RMAX rmax,
+ RMIN rmin, RMAX rmax,
STARTTHETA startTheta = 0.0, ENDTHETA endTheta = M_PI,
STARTPHI startPhi = 0.0, ENDPHI endPhi = 2. * M_PI) {
this->make(nam,
- _toDOuble(rmin), _toDouble(rmax),
+ _toDouble(rmin), _toDouble(rmax),
_toDouble(startTheta), _toDouble(endTheta),
_toDouble(startPhi), _toDouble(endPhi));
}
@@ -1181,9 +1228,27 @@ namespace dd4hep {
/// Constructor to create a new object. Phi(start)=0, deltaPhi=2PI, Z-planes at -zlen/2 and +zlen/2
PolyhedraRegular(int nsides, double rmin, double rmax, double zlen)
{ this->make("", nsides, rmin, rmax, zlen / 2, -zlen / 2, 0, 2.0*M_PI); }
+ /// Constructor to create a new object. Phi(start)=0, deltaPhi=2PI, Z-planes at -zlen/2 and +zlen/2
+ template <typename NSIDES, typename RMIN, typename RMAX, typename ZLEN>
+ PolyhedraRegular(NSIDES nsides, RMIN rmin, RMAX rmax, ZLEN zlen)
+ {
+ this->make("", _toDouble(nsides),
+ _toDouble(rmin), _toDouble(rmax),
+ _toDouble(zlen) / 2, -_toDouble(zlen) / 2,
+ 0, 2.0*M_PI);
+ }
/// Constructor to create a new object with phi_start, deltaPhi=2PI, Z-planes at -zlen/2 and +zlen/2
PolyhedraRegular(int nsides, double phi_start, double rmin, double rmax, double zlen)
{ this->make("", nsides, rmin, rmax, zlen / 2, -zlen / 2, phi_start, 2.0*M_PI); }
+ /// Constructor to create a new object with phi_start, deltaPhi=2PI, Z-planes at -zlen/2 and +zlen/2
+ template <typename NSIDES, typename PHI_START, typename RMIN, typename RMAX, typename ZLEN>
+ PolyhedraRegular(NSIDES nsides, PHI_START phi_start, RMIN rmin, RMAX rmax, ZLEN zlen)
+ {
+ this->make("", _toDouble(nsides),
+ _toDouble(rmin), _toDouble(rmax),
+ _toDouble(zlen) / 2, -_toDouble(zlen) / 2,
+ _toDouble(phi_start), 2.0*M_PI);
+ }
/// Constructor to create a new object. Phi(start)=0, deltaPhi=2PI, Z-planes a zplanes[0] and zplanes[1]
PolyhedraRegular(int nsides, double rmin, double rmax, double zplanes[2])
{ this->make("", nsides, rmin, rmax, zplanes[0], zplanes[1], 0, 2.0*M_PI); }
diff --git a/DDCore/src/Shapes.cpp b/DDCore/src/Shapes.cpp
index 3dd2fc58317eda7c921dcb08ce4624b2a4637461..c81b9eb47885a8d3aca22541e6e2fc2f3addeb7a 100644
--- a/DDCore/src/Shapes.cpp
+++ b/DDCore/src/Shapes.cpp
@@ -53,12 +53,18 @@ void Solid_type<T>::_assign(T* n, const string& nam, const string& tit, bool cbb
/// Access to shape name
template <typename T> const char* Solid_type<T>::name() const {
- return this->ptr()->GetName();
+ if ( this->ptr() ) {
+ return this->ptr()->GetName();
+ }
+ return this->access()->GetName(); // Trigger an exception if object is invalid
}
/// Access to shape name
template <typename T> const char* Solid_type<T>::title() const {
- return this->ptr()->GetTitle();
+ if ( this->ptr() ) {
+ return this->ptr()->GetTitle();
+ }
+ return this->access()->GetTitle(); // Trigger an exception if object is invalid
}
/// Set new shape name
@@ -78,7 +84,7 @@ template <typename T> const char* Solid_type<T>::type() const {
if ( this->ptr() ) {
return this->ptr()->IsA()->GetName();
}
- return "";
+ return this->access()->GetName(); // Trigger an exception on invalid handle
}
/// Access the dimensions of the shape: inverse of the setDimensions member function
@@ -258,21 +264,11 @@ void Polycone::addZPlanes(const vector<double>& rmin, const vector<double>& rmax
}
/// Constructor to be used when creating a new cone segment object
-ConeSegment::ConeSegment(double dz,
- double rmin1, double rmax1,
- double rmin2, double rmax2,
- double startPhi, double endPhi)
-{
- _assign(new TGeoConeSeg(dz, rmin1, rmax1, rmin2, rmax2,
- startPhi/units::deg, endPhi/units::deg), "", CONESEGMENT_TAG, true);
-}
-
-/// Constructor to be used when creating a new cone segment object
-ConeSegment::ConeSegment(const string& nam,
- double dz,
- double rmin1, double rmax1,
- double rmin2, double rmax2,
- double startPhi, double endPhi)
+void ConeSegment::make(const string& nam,
+ double dz,
+ double rmin1, double rmax1,
+ double rmin2, double rmax2,
+ double startPhi, double endPhi)
{
_assign(new TGeoConeSeg(nam.c_str(), dz, rmin1, rmax1, rmin2, rmax2,
startPhi/units::deg, endPhi/units::deg), "", CONESEGMENT_TAG, true);
diff --git a/DDCore/src/plugins/StandardPlugins.cpp b/DDCore/src/plugins/StandardPlugins.cpp
index 7efef5c7fac63c1ff6e5923665d75b147d362715..58e7d5613dab130b0ab0dba65e549dda1605b8c7 100644
--- a/DDCore/src/plugins/StandardPlugins.cpp
+++ b/DDCore/src/plugins/StandardPlugins.cpp
@@ -1163,17 +1163,17 @@ static long dump_volume_tree(Detector& description, int argc, char** argv) {
if ( m_detector != "/world" ) {
top = detail::tools::findElement(description,m_detector);
if ( !top.isValid() ) {
- except("DD4hep_GeometryDisplay","+++ Invalid DetElement path: %s",m_detector.c_str());
+ except("VolumeDump","+++ Invalid DetElement path: %s",m_detector.c_str());
}
}
if ( !top.placement().isValid() ) {
- except("DD4hep_GeometryDisplay","+++ Invalid DetElement placement: %s",m_detector.c_str());
+ except("VolumeDump","+++ Invalid DetElement placement: %s",m_detector.c_str());
}
string place = top.placementPath();
detail::tools::placementPath(top, path);
pv = detail::tools::findNode(description.world().placement(),place);
if ( !pv.isValid() ) {
- except("DD4hep_GeometryDisplay","+++ Invalid placement verification for placement:%s",place.c_str());
+ except("VolumeDump","+++ Invalid placement verification for placement:%s",place.c_str());
}
return this->dump("", top.placement().ptr(), pv.ptr(), 0, PlacedVolume::VolIDs());
}
diff --git a/DDDigi/include/DDDigi/DigiExponentialNoise.h b/DDDigi/include/DDDigi/DigiExponentialNoise.h
index de131aa516c8dea7d63619979dd2fb75900c9f42..5d906dc101018e51cae9024011318c4d58b0d821 100644
--- a/DDDigi/include/DDDigi/DigiExponentialNoise.h
+++ b/DDDigi/include/DDDigi/DigiExponentialNoise.h
@@ -43,7 +43,7 @@ namespace dd4hep {
/// Default destructor
virtual ~DigiExponentialNoise();
/// Callback to read event exponentialnoise
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
} // End namespace dd4hep
diff --git a/DDDigi/include/DDDigi/DigiGaussianNoise.h b/DDDigi/include/DDDigi/DigiGaussianNoise.h
index e0933b27acecd6d8ce7fa9468722fd58e679ef5b..6730e0abb13a05d67dd2014515b44c98ab2bfea8 100644
--- a/DDDigi/include/DDDigi/DigiGaussianNoise.h
+++ b/DDDigi/include/DDDigi/DigiGaussianNoise.h
@@ -50,7 +50,7 @@ namespace dd4hep {
/// Default destructor
virtual ~DigiGaussianNoise();
/// Callback to read event gaussiannoise
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
} // End namespace dd4hep
diff --git a/DDDigi/include/DDDigi/DigiLandauNoise.h b/DDDigi/include/DDDigi/DigiLandauNoise.h
index 0d9b268bd4f519f6caa232194ba0141ef59e7509..a497e23844611d2a1a9346fd3edd4a747dd734b6 100644
--- a/DDDigi/include/DDDigi/DigiLandauNoise.h
+++ b/DDDigi/include/DDDigi/DigiLandauNoise.h
@@ -50,7 +50,7 @@ namespace dd4hep {
/// Default destructor
virtual ~DigiLandauNoise();
/// Callback to read event landaunoise
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
} // End namespace dd4hep
diff --git a/DDDigi/include/DDDigi/DigiPoissonNoise.h b/DDDigi/include/DDDigi/DigiPoissonNoise.h
index 6cb3957ce63e94094890c0abf7a8bddcc0f359a9..95afd69d81139c965231dbe72b28d564ac0938b6 100644
--- a/DDDigi/include/DDDigi/DigiPoissonNoise.h
+++ b/DDDigi/include/DDDigi/DigiPoissonNoise.h
@@ -48,7 +48,7 @@ namespace dd4hep {
/// Default destructor
virtual ~DigiPoissonNoise();
/// Callback to read event poissonnoise
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
} // End namespace dd4hep
diff --git a/DDDigi/include/DDDigi/DigiRandomNoise.h b/DDDigi/include/DDDigi/DigiRandomNoise.h
index bbaf484f191663a8009bb1395cfba16ef8c57650..7d592f29ff7bde277c16425882af927eb40fb4ae 100644
--- a/DDDigi/include/DDDigi/DigiRandomNoise.h
+++ b/DDDigi/include/DDDigi/DigiRandomNoise.h
@@ -64,7 +64,7 @@ namespace dd4hep {
/// Initialize the noise source
virtual void initialize() override;
/// Callback to read event randomnoise
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
} // End namespace dd4hep
diff --git a/DDDigi/include/DDDigi/DigiSignalProcessor.h b/DDDigi/include/DDDigi/DigiSignalProcessor.h
index e12b19976a40e0d4f72edde8d9f44d07307c9a25..227da9139cd1f03e7bcdafa84ad23f6e9ceaf4e1 100644
--- a/DDDigi/include/DDDigi/DigiSignalProcessor.h
+++ b/DDDigi/include/DDDigi/DigiSignalProcessor.h
@@ -29,6 +29,21 @@ namespace dd4hep {
class DigiCellData;
class DigiSignalProcessor;
+ ///
+ /**
+ *
+ * \author M.Frank
+ * \version 1.0
+ * \ingroup DD4HEP_DIGITIZATION
+ */
+ class DigiCellContext final {
+ public:
+ DigiContext& context;
+ DigiCellData& data;
+ DigiCellContext(DigiContext& c, DigiCellData& d) : context(c), data(d) {}
+ ~DigiCellContext() = default;
+ };
+
/// Base class for signal processing actions to the digitization
/**
*
@@ -52,7 +67,7 @@ namespace dd4hep {
/// Initialize the noise source
virtual void initialize();
/// Callback to read event signalprocessor
- virtual double operator()(DigiContext& context, const DigiCellData& data) const = 0;
+ virtual double operator()(DigiCellContext& context) const = 0;
};
} // End namespace digi
} // End namespace dd4hep
diff --git a/DDDigi/include/DDDigi/DigiSignalProcessorSequence.h b/DDDigi/include/DDDigi/DigiSignalProcessorSequence.h
index 34637842c69a980defec6cff419a55925d9dc879..65b57ac5bb68529eff6594b1ae1807c3fd5ce020 100644
--- a/DDDigi/include/DDDigi/DigiSignalProcessorSequence.h
+++ b/DDDigi/include/DDDigi/DigiSignalProcessorSequence.h
@@ -57,7 +57,7 @@ namespace dd4hep {
/// Adopt a new action as part of the sequence. Sequence takes ownership.
void adopt(DigiSignalProcessor* action);
/// Begin-of-event callback
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
diff --git a/DDDigi/include/DDDigi/DigiUniformNoise.h b/DDDigi/include/DDDigi/DigiUniformNoise.h
index 1fcadf46327b2d091e0774e3d2d1490e6d690f39..f8e368f978999fa77ce0ed2d7505cfe18a67a5d3 100644
--- a/DDDigi/include/DDDigi/DigiUniformNoise.h
+++ b/DDDigi/include/DDDigi/DigiUniformNoise.h
@@ -45,7 +45,7 @@ namespace dd4hep {
/// Default destructor
virtual ~DigiUniformNoise();
/// Callback to read event uniformnoise
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
} // End namespace dd4hep
diff --git a/DDDigi/src/DigiExponentialNoise.cpp b/DDDigi/src/DigiExponentialNoise.cpp
index 226bffb11d2720a7e52671281f586f9a159df282..2a3d279eda31d29533b0b078694321ca9ad88a7c 100644
--- a/DDDigi/src/DigiExponentialNoise.cpp
+++ b/DDDigi/src/DigiExponentialNoise.cpp
@@ -33,6 +33,6 @@ DigiExponentialNoise::~DigiExponentialNoise() {
}
/// Callback to read event exponentialnoise
-double DigiExponentialNoise::operator()(DigiContext& context, const DigiCellData&) const {
- return context.randomGenerator().exponential(m_tau);
+double DigiExponentialNoise::operator()(DigiCellContext& context) const {
+ return context.context.randomGenerator().exponential(m_tau);
}
diff --git a/DDDigi/src/DigiGaussianNoise.cpp b/DDDigi/src/DigiGaussianNoise.cpp
index c07cfe1ee647e7e47a39a756f3e586e1b7872e4c..e86180f951fc3660f525c06eb574d00a4733f9f5 100644
--- a/DDDigi/src/DigiGaussianNoise.cpp
+++ b/DDDigi/src/DigiGaussianNoise.cpp
@@ -35,8 +35,8 @@ DigiGaussianNoise::~DigiGaussianNoise() {
}
/// Callback to read event gaussiannoise
-double DigiGaussianNoise::operator()(DigiContext& context, const DigiCellData& data) const {
- if ( data.signal < m_cutoff )
+double DigiGaussianNoise::operator()(DigiCellContext& context) const {
+ if ( context.data.signal < m_cutoff )
return 0;
- return context.randomGenerator().gaussian(m_mean,m_sigma);
+ return context.context.randomGenerator().gaussian(m_mean,m_sigma);
}
diff --git a/DDDigi/src/DigiLandauNoise.cpp b/DDDigi/src/DigiLandauNoise.cpp
index cafd804fcb9f527462cc80162acd906fd9f30ff8..61d527c751f6e4dfed4763347dceaac3210bbd5d 100644
--- a/DDDigi/src/DigiLandauNoise.cpp
+++ b/DDDigi/src/DigiLandauNoise.cpp
@@ -35,8 +35,8 @@ DigiLandauNoise::~DigiLandauNoise() {
}
/// Callback to read event landaunoise
-double DigiLandauNoise::operator()(DigiContext& context, const DigiCellData& data) const {
- if ( data.signal < m_cutoff )
+double DigiLandauNoise::operator()(DigiCellContext& context) const {
+ if ( context.data.signal < m_cutoff )
return 0;
- return context.randomGenerator().landau(m_mean,m_sigma);
+ return context.context.randomGenerator().landau(m_mean,m_sigma);
}
diff --git a/DDDigi/src/DigiPoissonNoise.cpp b/DDDigi/src/DigiPoissonNoise.cpp
index 85d7acbd452166e5531195c023487bade8d26bd2..0dbba79476ee46e717ab17d2e8908c651c57b229 100644
--- a/DDDigi/src/DigiPoissonNoise.cpp
+++ b/DDDigi/src/DigiPoissonNoise.cpp
@@ -34,8 +34,8 @@ DigiPoissonNoise::~DigiPoissonNoise() {
}
/// Callback to read event poissonnoise
-double DigiPoissonNoise::operator()(DigiContext& context, const DigiCellData& data) const {
- if ( data.signal >= m_cutoff )
+double DigiPoissonNoise::operator()(DigiCellContext& context) const {
+ if ( context.data.signal >= m_cutoff )
return 0;
- return context.randomGenerator().poisson(m_mean);
+ return context.context.randomGenerator().poisson(m_mean);
}
diff --git a/DDDigi/src/DigiRandomNoise.cpp b/DDDigi/src/DigiRandomNoise.cpp
index 10ca4b5961977894a69299d30d617593edddc24a..2cf3b0f25a54a05e24e41b64e2179cc8e6a652ef 100644
--- a/DDDigi/src/DigiRandomNoise.cpp
+++ b/DDDigi/src/DigiRandomNoise.cpp
@@ -38,6 +38,6 @@ void DigiRandomNoise::initialize() {
}
/// Callback to read event randomnoise
-double DigiRandomNoise::operator()(DigiContext& /* context */, const DigiCellData& /* data */) const {
+double DigiRandomNoise::operator()(DigiCellContext& /* context */) const {
return 0.0;
}
diff --git a/DDDigi/src/DigiSignalProcessorSequence.cpp b/DDDigi/src/DigiSignalProcessorSequence.cpp
index 83bc995d45495005689b041ec49b84474093de8d..7b03e1be31def97f37883f93f3668b5dbac7cf0f 100644
--- a/DDDigi/src/DigiSignalProcessorSequence.cpp
+++ b/DDDigi/src/DigiSignalProcessorSequence.cpp
@@ -44,9 +44,9 @@ void DigiSignalProcessorSequence::adopt(DigiSignalProcessor* action) {
}
/// Pre-track action callback
-double DigiSignalProcessorSequence::operator()(DigiContext& context, const DigiCellData& data) const {
- double result = data.signal;
+double DigiSignalProcessorSequence::operator()(DigiCellContext& context) const {
+ double result = context.data.signal;
for ( const auto* p : m_actors )
- result += p->operator()(context, data);
- return data.kill ? 0e0 : result;
+ result += p->operator()(context);
+ return context.data.kill ? 0e0 : result;
}
diff --git a/DDDigi/src/DigiUniformNoise.cpp b/DDDigi/src/DigiUniformNoise.cpp
index 4653560a547efb90f9998deda84f0494c9714bcb..22bab865e78d74fd940a74880795181fa5699cac 100644
--- a/DDDigi/src/DigiUniformNoise.cpp
+++ b/DDDigi/src/DigiUniformNoise.cpp
@@ -33,6 +33,6 @@ DigiUniformNoise::~DigiUniformNoise() {
}
/// Callback to read event uniformnoise
-double DigiUniformNoise::operator()(DigiContext& context, const DigiCellData& /* data */) const {
- return context.randomGenerator().uniform(m_min,m_max);
+double DigiUniformNoise::operator()(DigiCellContext& context) const {
+ return context.context.randomGenerator().uniform(m_min,m_max);
}
diff --git a/examples/CLICSiD/scripts/CLICSid.py b/examples/CLICSiD/scripts/CLICSid.py
index f71e1798c83dbd5065f60f60d9811daca3d25e3e..db6526f6a3ab5facd5a0a00255553ec630b25198 100644
--- a/examples/CLICSiD/scripts/CLICSid.py
+++ b/examples/CLICSiD/scripts/CLICSid.py
@@ -91,6 +91,7 @@ class CLICSid:
self.kernel.configure()
if have_geo:
self.kernel.initialize()
+ return self
# Test runner
def test_run(self, have_geo=True, have_physics=False):
diff --git a/examples/DDDigi/src/DigiTestSignalProcessor.cpp b/examples/DDDigi/src/DigiTestSignalProcessor.cpp
index 13081847569e5fe277ee58ce7f7b764a1872c13b..b5f1267d5cae809f285d8e60a0d5ad59fffca010 100644
--- a/examples/DDDigi/src/DigiTestSignalProcessor.cpp
+++ b/examples/DDDigi/src/DigiTestSignalProcessor.cpp
@@ -48,7 +48,7 @@ namespace dd4hep {
/// Default destructor
virtual ~DigiTestSignalProcessor();
/// Process signal data
- virtual double operator()(DigiContext& context, const DigiCellData& data) const override;
+ virtual double operator()(DigiCellContext& context) const override;
};
} // End namespace digi
@@ -96,6 +96,6 @@ DigiTestSignalProcessor::~DigiTestSignalProcessor() {
}
/// Process signal data
-double DigiTestSignalProcessor::operator()(DigiContext&, const DigiCellData& data) const {
- return m_attenuation * data.signal;
+double DigiTestSignalProcessor::operator()(DigiCellContext& context) const {
+ return m_attenuation * context.data.signal;
}