Skip to content

Commit 8e5487f

Browse files
committed
dev
1 parent f3ad202 commit 8e5487f

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cf/maths.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def histogram(*digitized, density=False):
231231
>>> print(p)
232232
Field: long_name=probability density function
233233
---------------------------------------------
234-
Data : long_name=probability density function(specific_humidity(10))
234+
Data : long_name=probability density function(specific_humidity(10)) 1
235235
Cell methods : latitude: longitude: point
236236
Dimension coords: specific_humidity(10) = [0.01015, ..., 0.13885] 1
237237
>>> print(p.data.round(2).array))
@@ -283,7 +283,7 @@ def histogram(*digitized, density=False):
283283
>>> print(p)
284284
Field: long_name=probability density function
285285
---------------------------------------------
286-
Data : long_name=probability density function(air_temperature(5), specific_humidity(10))
286+
Data : long_name=probability density function(air_temperature(5), specific_humidity(10)) K-1
287287
Cell methods : latitude: longitude: point
288288
Dimension coords: air_temperature(5) = [257.05, ..., 288.25] K
289289
: specific_humidity(10) = [0.01015, ..., 0.13885] 1
@@ -320,7 +320,6 @@ def histogram(*digitized, density=False):
320320
# Convert counts to densities
321321
out /= out.data.sum() * bin_measures
322322

323-
out.override_units(Units(), inplace=True)
324323
out.del_property("standard_name", None)
325324
out.set_property("long_name", "probability density function")
326325

cf/test/test_Maths.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ def test_histogram(self):
223223
h = cf.histogram(indices)
224224
self.assertTrue((h.array == [9, 7, 9, 4, 5, 1, 1, 1, 2, 1]).all)
225225
h = cf.histogram(indices, density=True)
226+
self.assertEqual(h.Units, cf.Units("1"))
226227
# Check that integral is 1
227228
bin_measures = h.dimension_coordinate().cellsize
228229
integral = (h * bin_measures).sum()
@@ -247,7 +248,7 @@ def test_histogram(self):
247248
)
248249

249250
h = cf.histogram(indices, indices_t, density=True)
250-
self.assertEqual(h.Units, cf.Units())
251+
self.assertEqual(h.Units, cf.Units("K-1"))
251252
# Check that integral is 1
252253
bin_measures = h.dimension_coordinate("air_temperature").cellsize
253254
bin_measures.outerproduct(

0 commit comments

Comments
 (0)