Request 89 (accepted)

turbina-core-dimm.changes Changed

turbina-core-dimm.spec Changed

dimm_tool-2.48.tar.bz2/.hg_archival.txt -> dimm_tool-2.49.tar.bz2/.hg_archival.txt Changed

dimm_tool-2.48.tar.bz2/Makefile -> dimm_tool-2.49.tar.bz2/Makefile Changed

dimm_tool-2.48.tar.bz2/camera.cpp -> dimm_tool-2.49.tar.bz2/camera.cpp Changed

dimm_tool-2.48.tar.bz2/etc/turdimm.cfg -> dimm_tool-2.49.tar.bz2/etc/turdimm.cfg Changed

@@ -1,4 +1,4 @@
-# DIMM channel configuration 2009.12.04 / 2006.04.20
+# DIMM channel configuration 2016.07.27
 Section "General"
     SubSection "Site"
         DeviceNumber          MD09      ;device serial number
@@ -14,15 +14,15 @@
 Section "Operations"
     SubSection "Normal"
         Exposure                2.5     ;frame exposure in ms (>=1)
-        FrameRate                 0     ;working framerate
+        FrameRate               250     ;working framerate
         BaseTime                  1     ;base time in sec.
         AccumTime                60     ;accumulation time in sec.
-        MeasBoxSide              40     ;measuring subframe size, x,y, pxs
+        MeasBoxSide              56     ;measuring subframe size, x,y, pxs
         StarRadius                7     ;image radius for GC calculation, px
         ThresholdFactor           4     ;in sigma level
 #        CGMethod             window    ;or  threshold - CG computation method
         CGMethod          threshold     ;or  threshold - CG computation method
-        MaxDropped               50     ; maximal number of the bad frames
+        MaxDropped               40     ; maximal number of the bad frames
     EndSubSection
     SubSection "Centering"
         Exposure                4.0     ;frame exposure in ms (>=1)
@@ -54,12 +54,13 @@
         FieldAperture           184     ;radius of the field diaphragm, px
         Scale                 0.634     ;frame scale, arcsec/px 
         FocalCoeff              200     ; connection to focal changeing
-        Separation               30     ; preferable images separation
-        OpticalCenter       334 215     ;optical center position on the frame, px
+        Separation               27     ; preferable images separation
+        OpticalCenter       356 221     ;optical center position on the frame, px
     EndSubSection        
     SubSection "Type"
-        Model          "Digital Camera (DCAM 1.31)"   ;camera model
-        Identification  0x00f310000007547
+        Model                    "Digital Camera (DCAM 1.31)" ;camera model
+        Identification      0x000f3100000075a0
+#        Identification     0x00f310000007547
         Digitization             12     ;camera digitization
     EndSubSection
     SubSection "Parameters"

dimm_tool-2.48.tar.bz2/iidc/iidc.cpp -> dimm_tool-2.49.tar.bz2/iidc/iidc.cpp Changed

@@ -22,8 +22,63 @@
 #include <iostream>
 #include <cmath>
 
+#include <sys/poll.h>
+#include <cstring>
+#include <cerrno>
+
 #include "iidc.h"
 
+namespace IIDC {
+namespace detail {
+
+class FrameQueue:
+	private ::detail::noncopyable {
+private:
+	Camera& camera_;
+	struct pollfd pollfd_;
+public:
+	FrameQueue(Camera& camera, unsigned int buffers): camera_(camera) {
+		dc1394error_t err;
+
+		err = dc1394_capture_setup(camera_.m_camera, buffers, DC1394_CAPTURE_FLAGS_DEFAULT);
+		if (err != DC1394_SUCCESS) throw Error(err);
+
+		std::memset(&pollfd_, 0, sizeof(struct pollfd));
+		pollfd_.fd = dc1394_capture_get_fileno(camera_.m_camera);
+		pollfd_.events = POLLIN | POLLERR;
+	}
+	~FrameQueue() {
+		/*
+		In the real world the following may fail only at internal ioctl FW_CDEV_IOC_STOP_ISO.
+		We can not help the kernel in that case.
+		*/
+		dc1394_capture_stop(camera_.m_camera);
+	}
+
+	Camera::CaptureBuffer* dequeue(unsigned int timeout) {
+		dc1394video_frame_t* frame;
+		dc1394error_t err;
+
+		int ret = poll(&pollfd_, 1, timeout);
+		if (ret < 0)
+			throw Error(std::strerror(errno));
+		else if (ret == 0)
+			throw Error("Timeout occurred while frame dequeue");
+
+		err = dc1394_capture_dequeue( camera_.m_camera, DC1394_CAPTURE_POLICY_POLL, &frame );
+		if ( err != DC1394_SUCCESS ) throw Error( err );
+		return new Camera::CaptureBuffer(camera_, frame);
+	}
+	void enqueue(Camera::CaptureBuffer* buffer) {
+		dc1394error_t err;
+		err = dc1394_capture_enqueue( camera_.m_camera, buffer->m_frame );
+		if ( err != DC1394_SUCCESS ) throw Error( err );
+	}
+};
+
+} // details
+} // IIDC
+
 IIDC::DC1394Context::DC1394Context(): m_dc1394( dc1394_new() ) {
 	if( m_dc1394 == NULL ){
 		throw Error("Can't allocate dc1394 context");
@@ -380,26 +435,27 @@
 	if ( err != DC1394_SUCCESS ) throw Error( err );
 } 
 void IIDC::Camera::stopCapture(){
-	dc1394error_t err;
-	err = dc1394_capture_stop( m_camera );
-	if ( err != DC1394_SUCCESS ) throw Error( err );
+	m_queue.reset();
 }
 void IIDC::Camera::setupCapture( unsigned int buffers ){
-	dc1394error_t err;
-	err = dc1394_capture_setup( m_camera, buffers, DC1394_CAPTURE_FLAGS_DEFAULT );
-	if ( err != DC1394_SUCCESS ) throw Error( err );
+	stopCapture(); // delete existing capture before setting up the new one
+	m_queue.reset(new detail::FrameQueue(*this, buffers));
 }
-IIDC::Camera::CaptureBuffer* IIDC::Camera::capture( CapturePolicy policy ) {
-	dc1394video_frame_t* frame;
-	dc1394error_t err;
-	err = dc1394_capture_dequeue( m_camera, dc1394capture_policy_t( policy ), &frame );
-	if ( err != DC1394_SUCCESS ) throw Error( err );
-	return new CaptureBuffer( *this, frame );
-}
-void IIDC::Camera::freeDMA( IIDC::Camera::CaptureBuffer* cbuf ) {
-	dc1394error_t err;
-	err = dc1394_capture_enqueue( m_camera, cbuf->m_frame );
-	if ( err != DC1394_SUCCESS ) throw Error( err );
+IIDC::Camera::CaptureBuffer* IIDC::Camera::capture(unsigned int timeout) {
+        if (!m_queue.get())
+                throw Error("Capture is not set up");
+        return m_queue->dequeue(timeout);
+}
+void IIDC::Camera::freeDMA( IIDC::Camera::CaptureBuffer* cbuf ) throw() {
+	if (m_queue.get()) {
+		try {
+			m_queue->enqueue(cbuf);
+		} catch(...) {
+			/*
+			We can not propogate this error.
+			*/
+		}
+	}
 }
 IIDC::Camera::CaptureBuffer::CaptureBuffer( Camera& parent, dc1394video_frame_t* frame ): m_camera(parent), m_frame(frame) {
 }

dimm_tool-2.48.tar.bz2/iidc/iidc.h -> dimm_tool-2.49.tar.bz2/iidc/iidc.h Changed

@@ -23,6 +23,7 @@
 
 #include <list>
 #include <stdexcept>
+#include <memory>
 
 /* IIDC Camera interface */
 
@@ -35,12 +36,16 @@
 int bus_reset_handler(raw1394handle_t handle, unsigned int generation);
 
 namespace IIDC{
+	namespace detail {
+		class FrameQueue;
+	}
+
 	class DC1394Context;
 	class Error;
 	class Camera;
 
 	class DC1394Context:
-		private detail::noncopyable {
+		private ::detail::noncopyable {
 	private:
 		dc1394_t* m_dc1394;
 	public:
@@ -77,10 +82,11 @@
 		éÎËÁÐÓÕÌÉÒÕÅÔ dc1394camera_t, ÐÒÅÄÏÓÔÁ×ÌÑÑ ÄÏÓÔÕÐ
 		Ë ×ÙÚÏ×ÁÍ libdc1394.
 	*/
-	class Camera:
-		private detail::noncopyable {
+	class Camera: private ::detail::noncopyable {
+	friend class detail::FrameQueue;
 	private:
 		dc1394camera_t* m_camera;
+		std::auto_ptr<detail::FrameQueue> m_queue;
 	public:
 		Camera( uint64_t guid, DC1394Context& dc1394 = DC1394Context::getGlobal() );
 		~Camera();
@@ -235,7 +241,7 @@
 		
 		class CaptureBuffer:
 			private noncopyable{
-		friend class Camera;
+		friend class detail::FrameQueue;
 		private:
 			Camera& m_camera;
 			dc1394video_frame_t* m_frame;
@@ -305,8 +311,8 @@
 		/* capture */
 		void stopCapture();
 		void setupCapture( unsigned int buffers );
-		CaptureBuffer* capture( CapturePolicy policy = Wait );
-		void freeDMA( CaptureBuffer* cbuf );
+		CaptureBuffer* capture(unsigned int timeout);
+		void freeDMA( CaptureBuffer* cbuf ) throw();
 	};
 
 	template<class T> class VideoStream:
@@ -315,12 +321,13 @@
 		typedef IIDC::Camera* DeviceType;
 	private:
 		DeviceType m_device;
+		unsigned int m_timeout;
 	protected:
 		void initDevice( );
 		void destroyDevice( );
 		virtual void captureFrame( Frame<T>& f );
 	public:
-		VideoStream(DeviceType device);
+		VideoStream(DeviceType device, unsigned int timeout);
 		~VideoStream();
 	};

dimm_tool-2.48.tar.bz2/iidc/iidc.tcc -> dimm_tool-2.49.tar.bz2/iidc/iidc.tcc Changed

dimm_tool-2.48.tar.bz2/main.cpp -> dimm_tool-2.49.tar.bz2/main.cpp Changed

dimm_tool-2.48.tar.bz2/modes.cpp -> dimm_tool-2.49.tar.bz2/modes.cpp Changed

@@ -92,9 +92,9 @@
     cam->setParameters( camera );
     Timer timer( accumtime+spar_time );
     int nframe = (int)rint( accumtime*cam->effFPS(camera));
-    cent_win &= cam->ccdFormat();                           // Limit window by CCD format
-    Record camrec( cam, cent_win );                         // Window against CCD
-    win<int> cent_image = cent_win - cent_win.beg();          // Window against image
+    cent_win &= cam->ccdFormat();                               // Limit window by CCD format
+    Record camrec( cam, cent_win );                             // Window against CCD
+    win<int> cent_image = cent_win - cent_win.beg();            // Window against image
 
     double acquis_end = utc.currentSec() + accumtime - 0.001*camera.exposure;
     for( nframe = 0; utc.currentSec() < acquis_end && !timer.out() && !break_mode ; nframe++ ) {
@@ -106,16 +106,15 @@
             int left = ( mark_spots0.pos().x() < mark_spots1.pos().x() )? 0 : 1;
             mark_spots1-left.set( mark_spots1-left.pos() - mark_spotsleft.pos() );        // differ
             mark_spotsleft.set( mark_spotsleft.pos() + mark_spots1-left.pos()/2.0 );      // common
-            L_spots.push_back( mark_spotsleft );      // common
-            R_spots.push_back( mark_spots1-left );    // differ
+            L_spots.push_back( mark_spotsleft );              // common
+            R_spots.push_back( mark_spots1-left );            // differ
         }
     }
     out->writeFrame( &image, program_img + "centerframe.fits" );
-    if( !(L_spots.size() &&  R_spots.size()) )
-            throw ErrFat ( ERR_CENT_EMPTY, "No two star images" );
+    if( !(L_spots.size() &&  R_spots.size()) ) throw ErrFat ( ERR_CENT_EMPTY, "No two star images" );
     L_star = Stat::average( L_spots );
     R_star = Stat::average( R_spots );
-    common = L_star.pos() + cent_win.beg();   // Transformation to CCD coordinates
+    common = L_star.pos() + cent_win.beg();                     // Transformation to CCD coordinates
     differ = R_star.pos();
     check();
     out->centResult( subs_center, bias, fluxes(), offset(), separation() );
@@ -124,20 +123,12 @@
 void Center::check() {
     star comm = (L_star + R_star)/2.0;
     star diff = R_star - L_star;
-    if( fabs(diff.max()/comm.max()) > MAX_MAX_DIFF )
-        ErrlogSingl::instance().warning( "Images have different max brightness", diff.max()/comm.max() );
-    if( fabs(diff.sum()/comm.sum()) > MAX_TOT_DIFF )
-        ErrlogSingl::instance().warning( "Images have different total brightness", diff.sum()/comm.sum() );
-    if( fabs(differ.y()) > MAX_Y_DIFF )
-        ErrlogSingl::instance().warning( "Images are much shifted verticaly", differ.y() );
-    if( differ.x() < focal.separation - MIN_X_DIFF ) {
-        ErrlogSingl::instance().warning( "Images are close horizontaly", differ.x() );
-    }
-    if( differ.x() > focal.separation + MIN_X_DIFF ) {
-        ErrlogSingl::instance().warning( "Images are far horizontaly", differ.x() );
-    }
-    if( common.distance(focal.optic_axis) > focal.field )
-        ErrlogSingl::instance().warning( "Images are far from center", focal.field );
+    if( fabs(diff.max()/comm.max()) > MAX_MAX_DIFF ) ErrlogSingl::instance().warning( "Images have different max brightness", diff.max()/comm.max() );
+    if( fabs(diff.sum()/comm.sum()) > MAX_TOT_DIFF ) ErrlogSingl::instance().warning( "Images have different total brightness", diff.sum()/comm.sum() );
+    if( fabs(differ.y()) > MAX_Y_DIFF ) ErrlogSingl::instance().warning( "Images are much shifted verticaly", differ.y() );
+    if( differ.x() < focal.separation - MIN_X_DIFF ) ErrlogSingl::instance().warning( "Images are close horizontaly", differ.x() );
+    if( differ.x() > focal.separation + MIN_X_DIFF ) ErrlogSingl::instance().warning( "Images are far horizontaly", differ.x() );
+    if( common.distance(focal.optic_axis) > focal.field ) ErrlogSingl::instance().warning( "Images are far from center", focal.field );
 }
 
 Normal::Normal( Config& cf, Camera &cm, Center &modcen  ) : Mode( cf, cm, subs_normal ) {
@@ -153,13 +144,6 @@
 }
 
 bool Normal::check_bound( int nf, spot& le, spot& re ){
-/*    std::string bound_side;
-    if( le.pos().x() < stars_box.beg().x() + radius ) bound_side = " ~LB";
-    if( re.pos().x() > stars_box.end().x() - radius ) bound_side = " ~RB";
-    if( min( le.pos().y(), re.pos().y()) < stars_box.beg().y() + radius ) bound_side = " ~BB";
-    if( max( le.pos().y(), re.pos().y()) > stars_box.end().y() - radius ) bound_side = " ~UB";
-    bool alert = !bound_side.empty();
-    if( alert ) ErrlogSingl::instance().warning( out->wrongData( nf, bound_side, (star&)le, (star&)re ));*/
     bool alert = false;
     if( le.pos().x() < stars_box.beg().x() + radius ) alert = true;
     if( re.pos().x() > stars_box.end().x() - radius ) alert = true;
@@ -169,17 +153,6 @@
 }
 
 bool Normal::check_separ( int nf, spot& L, spot& R, int sep ){
-/*    std::string bound_side;
-    if( R.pos().x() - L.pos().x() < sep - 2*radius ) bound_side = " <SP";
-    if( R.pos().x() - L.pos().x() > sep + 2*radius ) bound_side = " >SP";
-    bool alert = !bound_side.empty();
-    if( alert ) ErrlogSingl::instance().warning( out->wrongData( nf, bound_side, (star&)L, (star&)R ) );*/
-//     bool alert = false;
-//     if( R.pos().x() - L.pos().x() < sep - 2*radius ) alert = true;
-//     if( R.pos().x() - L.pos().x() > sep + 2*radius ) alert = true;
-//     return alert;
-//     double diffs = R.pos().x() - L.pos().x() - sep;
-//     return (( diffs < -2*radius )||( diffs > 2*radius ))? true : false;
     return ( std::abs(R.pos().x() - L.pos().x() - sep ) > 2*radius ) ? true : false;
 }
 
@@ -205,20 +178,15 @@
     R_spots.reserve(nframe);
     int V_size = box_yside/2;
     int separation_x = (int)separation().x();
-//    int H_size = box_yside + separation_x/2;
     int H_size = box_yside/2 + separation_x/2;
-    win<int> ccd_box( -H_size, -V_size, H_size, V_size );       // This window against CCD
-//    stars_box = win<int>( V_size, 0, 2*H_size - V_size, 2*V_size );
+    win<int> ccd_box( -H_size, -V_size, H_size, V_size );               // This window against CCD
     stars_box = win<int>( 0, 0, 2*H_size, 2*V_size );
-   double acquis_end = utc.currentSec() + basetime;
-    for( int i = 0; i < accumtime/basetime && !timer.out() && !break_mode; i++){
+    double acquis_end = utc.currentSec() + basetime;
+    for( int i = 0; i < accumtime/basetime && !timer.out() && !break_mode; i++) {
         win<int> wbox  = ccd_box + common;
-        if( common.distance(focal.optic_axis) > 0.5*focal.field )
-                    ErrlogSingl::instance().warning( "Images are far from center", focal.field );
-        if( common.distance(focal.optic_axis) > focal.field - focal.separation )
-                    throw ErrFat ( ERR_NORM_SHIF, "Images are very far from center" );
-        if( !( wbox == (wbox&cam->ccdFormat())) )
-                    throw ErrFat ( ERR_NORM_SHIF, "Subframe is out CCD borders" );
+        if( !( wbox == (wbox&cam->ccdFormat())) ) throw ErrFat ( ERR_NORM_SHIF, "Subframe is out CCD borders" );
+        if( common.distance(focal.optic_axis) > focal.field - focal.separation ) throw ErrFat ( ERR_NORM_SHIF, "Images are very far from center" );
+        if( common.distance(focal.optic_axis) > 0.5*focal.field ) ErrlogSingl::instance().warning( "Images are far from center", focal.field );
         Record camrec( cam, wbox );
         int fskipped = 0;
         for( nframe = 0; utc.currentSec() < acquis_end && !timer.out(); nframe++ ) {

dimm_tool-2.48.tar.bz2/modes.h -> dimm_tool-2.49.tar.bz2/modes.h Changed

Overview

Request 89 (accepted)

Request History