r10439: canera database

[cl-photo.git] / dof.lisp

diff --git a/dof.lisp b/dof.lisp
index 4dcb7e7586fc2ed2002b03d00d707d5f53ad1463..4117c5a0f7d703dacce30a0e2cd51315c211945f 100755 (executable)
--- a/dof.lisp
+++ b/dof.lisp
@@ -19,14 +19,27 @@
 
 (in-package #:photo)
 
+(defun coc (imager-size &key (lpm 5) (minimum-distance 250) 
+                   (viewing-distance 250)
+                   (print-size (output-dimensions :8x10in)))
+  "Returns circle of confusion in mm and print magnification for a format. 
+Default resolving power is 5 lpm at 25cm."
+
+  (let* ((imager-diagonal (diagonal (car imager-size) (cdr imager-size)))
+         (print-diagonal (diagonal (car print-size) (cdr print-size)))
+         (resolution-factor (/ (* lpm print-diagonal minimum-distance)
+                               (* imager-diagonal viewing-distance)))
+         (coc (/ 1.0d0 resolution-factor))
+         (print-magnification (/ print-diagonal imager-diagonal)))
+    (values coc print-magnification)))
 
 (defun coc-format (format &key (lpm 5) (minimum-distance 250) 
                           (viewing-distance 250)
-                          (print-size (format-dimensions :8x10in)))
+                          (print-size (output-dimensions :8x10in)))
   "Returns circle of confusion in mm and print magnification for a format. 
 Default resolving power is 5 lpm at 25cm."
 
-  (let* ((format-size (format-dimensions format))
+  (let* ((format-size (imager-dimensions format))
          (format-diagonal (diagonal (car format-size) (cdr format-size)))
          (print-diagonal (diagonal (car print-size) (cdr print-size)))
          (resolution-factor (/ (* lpm print-diagonal minimum-distance)
@@ -35,21 +48,15 @@ Default resolving power is 5 lpm at 25cm."
          (print-magnification (/ print-diagonal format-diagonal)))
     (values coc print-magnification)))
 
-(defun coc-sensor (format nx ny)
+(defun coc-pixels (imager pixels)
   "Returns circle of confusion based on pixel size."
-  (let* ((dim (format-dimensions format))
-         (pixel-width (/ (car dim) nx))
-         (pixel-height (/ (cdr dim) ny))) 
-    (values (float (* 2 pixel-width))
-            (float (* 2 pixel-height)))))
-
-(defun coc-sensor-camera (camera &key (format :aps))
-  (let ((dim (sensor-dimensions camera :format format)))
-    (coc-sensor format (car dim) (cdr dim))))
-
-
-
-
+  (when (and (consp imager) (consp pixels))
+    (values (float (* 2 (/ (car imager) (car pixels))))
+            (float (* 2 (/ (cdr imager) (cdr pixels)))))))
+  
+(defun coc-pixels-format (format)
+  "Returns circle of confusion based on pixel size."
+  (coc-pixels (imager-dimensions format) (pixel-dimensions format)))
 
 (defun coc-airy (f-stop)
   "Return the circle of confusion based on the airy disk."
@@ -97,6 +104,9 @@ Pupil factor is the ratio of the exit to enterance pupil diameters."
     (values near far depth mag infinity-blur-diameter)))
 
 (defun dof (focal-length f-stop distance coc &key (units :mm) (pupil-factor 1))
+  "Returns the Depth of Field.
+Input: FOCAL-LENGTH, F-STOP, DISTANCE, CIRCLE-OF-CONFUSION. 
+Output: NEAR-POINT, FAR-POINT, TOTAL-DOF, MAGNIFICATION, BLUR-SIZE-OF-INFINITY-POINT-IN-MM."
   (multiple-value-bind (near-point far-point total-dof mag blur)
       (dof-mm focal-length f-stop (length->mm distance units) coc 
               :pupil-factor pupil-factor)
@@ -106,15 +116,7 @@ Pupil factor is the ratio of the exit to enterance pupil diameters."
             mag blur)))
 
 (defun hyperfocal (focal-length f-stop coc &key (units :mm))
-  (mm->length 
-   (+ focal-length (/ (* focal-length focal-length) f-stop coc))
-   units))
-
-(defun magnification (focal-length distance)
-  (float (/ focal-length (- distance focal-length))))
-
-(defun bellows-factor (focal-length distance)
-  (1+ (magnification focal-length distance)))
+  (mm->length (+ focal-length (/ (* focal-length focal-length) f-stop coc)) units))
 
 (defun effective-aperture (focal-length distance aperture)
   (* aperture (bellows-factor focal-length distance)))