@@ -29,21 +29,21 @@ namespace galsim {
2929 /* *
3030 * @brief A private class that caches the photon shooting objects for a given
3131 * obscuration value, so they don't have to be set up again each time.
32- *
32+ *
3333 * This is helpful if people use only 1 or a small number of obscuration values.
3434 */
3535 class AiryInfo
3636 {
3737 public:
38- /* *
38+ /* *
3939 * @brief Constructor
4040 */
4141 AiryInfo () {}
4242
4343 // / @brief Destructor: deletes photon-shooting classes if necessary
4444 virtual ~AiryInfo () {}
4545
46- /* *
46+ /* *
4747 * @brief Returns the real space value of the Airy function,
4848 * normalized to unit flux (see private attributes).
4949 * @param[in] r should be given in units of lam_over_D (i.e. r_true*D)
@@ -55,7 +55,7 @@ namespace galsim {
5555
5656 /* *
5757 * @brief Returns the k-space value of the Airy function.
58- * @param[in] ksq_over_pisq should be given in units of lam_over_D
58+ * @param[in] ksq_over_pisq should be given in units of lam_over_D
5959 * (i.e. k_true^2 / (pi^2 * D^2))
6060 *
6161 * This is used to calculate the real kValue, but it comes back unnormalized.
@@ -78,12 +78,12 @@ namespace galsim {
7878 boost::shared_ptr<PhotonArray> shoot (int N, UniformDeviate ud) const ;
7979
8080 protected:
81- double _stepk; // /< Sampling in k space necessary to avoid folding
81+ double _stepk; // /< Sampling in k space necessary to avoid folding
8282
8383 virtual void checkSampler () const = 0;
8484
8585 // /< Class that can sample radial distribution
86- mutable boost::shared_ptr<OneDimensionalDeviate> _sampler;
86+ mutable boost::shared_ptr<OneDimensionalDeviate> _sampler;
8787
8888 private:
8989 AiryInfo (const AiryInfo& rhs); // /< Hides the copy constructor.
@@ -95,7 +95,7 @@ namespace galsim {
9595 class AiryInfoObs : public AiryInfo
9696 {
9797 public:
98- AiryInfoObs (double obscuration, const GSParamsPtr& _gsparams);
98+ AiryInfoObs (double obscuration, const GSParamsPtr& _gsparams);
9999 ~AiryInfoObs () {}
100100
101101 double xValue (double r) const ;
@@ -110,15 +110,15 @@ namespace galsim {
110110 * Input radius is in units of lambda/D. Output normalized
111111 * to integrate to unity over input units.
112112 */
113- class RadialFunction : public FluxDensity
113+ class RadialFunction : public FluxDensity
114114 {
115115 public:
116116 /* *
117117 * @brief Constructor
118118 * @param[in] obscuration Fractional linear size of central obscuration of pupil.
119119 * @param[in] obssq Pre-computed obscuration^2 supplied as input for speed.
120120 */
121- RadialFunction (double obscuration, double obssq, const GSParamsPtr& gsparams) :
121+ RadialFunction (double obscuration, double obssq, const GSParamsPtr& gsparams) :
122122 _obscuration (obscuration), _obssq(obssq),
123123 _norm (M_PI / (1 .-_obssq)), _gsparams(gsparams) {}
124124
@@ -143,16 +143,16 @@ namespace galsim {
143143 const GSParamsPtr _gsparams;
144144
145145 // / Circle chord length at `h < r`.
146- double chord (double r, double h, double rsq, double hsq) const ;
146+ double chord (double r, double h, double rsq, double hsq) const ;
147147
148148 // / @brief Area inside intersection of 2 circles radii `r` & `s`, seperated by `t`.
149149 double circle_intersection (
150- double r, double s, double rsq, double ssq, double tsq) const ;
151- double circle_intersection (double r, double rsq, double tsq) const ;
150+ double r, double s, double rsq, double ssq, double tsq) const ;
151+ double circle_intersection (double r, double rsq, double tsq) const ;
152152
153153 // / @brief Area of two intersecting identical annuli.
154154 double annuli_intersect (
155- double r1, double r2, double r1sq, double r2sq, double tsq) const ;
155+ double r1, double r2, double r1sq, double r2sq, double tsq) const ;
156156
157157 void checkSampler () const ; // /< Check if `OneDimensionalDeviate` is configured.
158158 };
@@ -168,7 +168,7 @@ namespace galsim {
168168 double kValue (double ksq_over_pisq) const ;
169169
170170 private:
171- class RadialFunction : public FluxDensity
171+ class RadialFunction : public FluxDensity
172172 {
173173 public:
174174 RadialFunction (const GSParamsPtr& gsparams) : _gsparams(gsparams) {}
@@ -186,7 +186,7 @@ namespace galsim {
186186 void checkSampler () const ; // /< Check if `OneDimensionalDeviate` is configured.
187187 };
188188
189- class SBAiry ::SBAiryImpl : public SBProfileImpl
189+ class SBAiry ::SBAiryImpl : public SBProfileImpl
190190 {
191191 public:
192192 SBAiryImpl (double lam_over_D, double obs, double flux,
@@ -197,15 +197,15 @@ namespace galsim {
197197 double xValue (const Position<double >& p) const ;
198198 std::complex <double > kValue (const Position<double >& k) const ;
199199
200- bool isAxisymmetric () const { return true ; }
200+ bool isAxisymmetric () const { return true ; }
201201 bool hasHardEdges () const { return false ; }
202202 bool isAnalyticX () const { return true ; }
203203 bool isAnalyticK () const { return true ; }
204204
205205 double maxK () const ;
206206 double stepK () const ;
207207
208- Position<double > centroid () const
208+ Position<double > centroid () const
209209 { return Position<double >(0 ., 0 .); }
210210
211211 double getFlux () const { return _flux; }
@@ -235,13 +235,13 @@ namespace galsim {
235235 double kx0, double dkx, double dkxy,
236236 double ky0, double dky, double dkyx) const ;
237237
238- std::string repr () const ;
238+ std::string serialize () const ;
239239
240240 private:
241-
241+
242242 double _lam_over_D; // /< inverse of _D (see below), harmonise inputs with other GSObjects
243- /* *
244- * `_D` = (telescope diam) / (lambda * focal length) if arg is focal plane position,
243+ /* *
244+ * `_D` = (telescope diam) / (lambda * focal length) if arg is focal plane position,
245245 * else `_D` = (telescope diam) / lambda if arg is in radians of field angle.
246246 */
247247 double _D;
@@ -259,14 +259,13 @@ namespace galsim {
259259 SBAiryImpl (const SBAiryImpl& rhs);
260260 void operator =(const SBAiryImpl& rhs);
261261
262- // / Info object that stores things that are common to all Airy functions with this
262+ // / Info object that stores things that are common to all Airy functions with this
263263 // / obscuration value.
264- const boost::shared_ptr<AiryInfo> _info;
264+ const boost::shared_ptr<AiryInfo> _info;
265265
266266 // / One static map of all `AiryInfo` structures for whole program.
267267 static LRUCache< std::pair< double , GSParamsPtr >, AiryInfo > cache;
268268 };
269269}
270270
271271#endif
272-
0 commit comments