Open Build Service

turbina-core-mass.changes Changed

turbina-core-mass.spec Changed

turbina_core_m-1.27.tar.bz2/.hg_archival.txt -> turbina_core_m-1.28.tar.bz2/.hg_archival.txt Changed

turbina_core_m-1.27.tar.bz2/.hgtags -> turbina_core_m-1.28.tar.bz2/.hgtags Changed

turbina_core_m-1.27.tar.bz2/Makefile -> turbina_core_m-1.28.tar.bz2/Makefile Changed

turbina_core_m-1.27.tar.bz2/parameter_set.cpp -> turbina_core_m-1.28.tar.bz2/parameter_set.cpp Changed

@@ -31,6 +31,7 @@
     double scale  = 2.9670597216e-06;
     std::vector< point<double> > crv;
     vector< double > tau( 4 );
+    vector< double > p( 4 );
     double exposure = 1.0;
     double basetime = 1;
     double nacctime = 60;
@@ -90,6 +91,10 @@
     static std::string nonlin_b_key("devices/bicounter 2/nonlinearityb");
     static std::string nonlin_c_key("devices/bicounter 1/nonlinearitya");
     static std::string nonlin_d_key("devices/bicounter 1/nonlinearityb");
+    static std::string nopois_a_key("devices/bicounter 2/nonpoissona");
+    static std::string nopois_b_key("devices/bicounter 2/nonpoissonb");
+    static std::string nopois_c_key("devices/bicounter 1/nonpoissona");
+    static std::string nopois_d_key("devices/bicounter 1/nonpoissonb");
     exposure = get<double>( ::get( rPs, expos_key ) );
     basetime = get<double>( ::get( rPs, btime_key ) );
     nacctime = get<double>( ::get( rPs, atime_key ) );
@@ -98,6 +103,10 @@
     tau(1) =   get<double>( ::get( rPs, nonlin_b_key ) )/1e6;
     tau(2) =   get<double>( ::get( rPs, nonlin_c_key ) )/1e6;
     tau(3) =   get<double>( ::get( rPs, nonlin_d_key ) )/1e6;
+    p(0)   =   get<double>( ::get( rPs, nopois_a_key ) );
+    p(1)   =   get<double>( ::get( rPs, nopois_b_key ) );
+    p(2)   =   get<double>( ::get( rPs, nopois_c_key ) );
+    p(3)   =   get<double>( ::get( rPs, nopois_d_key ) );
 //    std::cerr << "Exp " << exposure << " Bt " << basetime << " NA " << nacctime << " BA " << bacctime << std::endl;
     parm_is_set = true;
     return parm_is_set;
@@ -107,6 +116,10 @@
     return tau;
 }
 
+vector <double>& parameters::p0() {
+    return p;
+}
+
 void parameters::P_line_parse( const std::string& p, const std::string& s ){
     std::string::size_type i = 0;
     std::string params;

turbina_core_m-1.27.tar.bz2/parameter_set.h -> turbina_core_m-1.28.tar.bz2/parameter_set.h Changed

turbina_core_m-1.27.tar.bz2/prephot.cpp -> turbina_core_m-1.28.tar.bz2/prephot.cpp Changed

@@ -95,6 +95,17 @@
 //    std::cout << s << std::endl;
 }
 
+void sharp_line( const std::string& s ) {
+//      std::cout << s << std::endl;
+    
+    if( s.find( "Parked", data_begin ) != std::string::npos ) {
+        basetime_number = processing::run_background();
+        basetime_number = processing::run_star(); 
+        std::cout << s << std::endl;
+        parameters::new_instrument_constant( dc_normal_mode, ut_normal_mode );    
+    }
+}
+
 void A_line( const std::string& s ) {
     if( mode == "Background" ) {
         processing::add_background( s.substr( data_begin ), mean_mz/basetime_number, 0.5*(mjd_first + mjd_last) );
@@ -117,7 +128,7 @@
         cfpair( 's', &s_line ),
         cfpair( 'A', &A_line ),
         cfpair( 'C', &C_line ),
-        cfpair( '#', &C_line ),
+        cfpair( '#', &sharp_line ),
         cfpair( 'c', &C_line )
     };
 }
@@ -130,7 +141,7 @@
     try {
         
 //        if( parameters::comand_line_parse( argc, argv  ) < 0 ) return -1;
-        std::cout << "#" << "Prephot Vers." << "1.00" << " Compiled " << __TIME__ << " " << __DATE__<< std::endl;
+        std::cout << "#" << "Prephot Vers." << "1.50" << " Compiled " << __TIME__ << " " << __DATE__<< std::endl;
 //        parameters::init_keys();
         parameters::last_instrument_constant();
         while( getline( std::cin, dimm_line ) ) {

turbina_core_m-1.27.tar.bz2/processing.cpp -> turbina_core_m-1.28.tar.bz2/processing.cpp Changed

@@ -18,14 +18,12 @@
 
 using namespace boost::numeric::ublas;
 
-// To do: ËÏÎÔÒÏÌØ ÄÌÉÎÎÙ ××ÏÄÉÍÏÊ ÓÔÒÏËÉ d ÎÁ ÐÒÅÄÍÅÔ ÎÅÆÏÒÍÁÔÎÏÇÏ ××ÏÄÁ
-//        ×ËÌÁÄ ÎÉÚËÏÊ ÞÁÓÔÏÔÙ ÐÏ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÙÍ ÒÁÚÎÏÓÔÑÍ Ó ËÏÎÔÒÏÌÅÍ ×ÅÌÉÞÉÎÙ
-//        ÄÌÑ ÉÓËÌÀÞÅÎÉÑ ÐÅÒÅÆÏËÕÓÉÒÏ×ËÉ.
-
 const double aperture_factor = 11.5;
 const unsigned int window = 2;
 const double mindelta = 0.25;
 const double mintime = 6.0/60.0/24.0 ;
+const double plimits = 0.05;
+
 struct photo {
     std::string name;
     double MASS_mag;
@@ -35,8 +33,6 @@
     photo() { MASS_mag = 0; moment = 0; mz = 0; flux = 0;};
 }; 
 
-
-
 namespace processing {
     Coord<equ> star;
     double MASS_mag;
@@ -51,6 +47,7 @@
     std::vector< double > star_mass;
     double extinct = 0.2;
     bool star_is = false;
+    
 }
 
 unsigned int processing::add_background( const std::string& s, double mz, double moment ) {
@@ -60,9 +57,14 @@
     istr >> fluxes >> vars;    
     if( istr.eof() || istr.fail() ) throw std::ios_base::failure( "Background moments input fail" );    
                     // verification
+    vector< double > poiss = element_prod( fluxes, vars );
+    vector< double > poiss0(parameters::p0());
+//    std::cout << "Back quality " << std::fixed << std::setprecision(3) << poiss << std::endl;
     
+    if( poiss(2) > poiss0(2) + plimits || poiss(3) > poiss0(3) + plimits ) throw std::ios_base::failure( "This is no background measurement" );
                     // c+d apertures
     double flux  =  fluxes(2) + fluxes(3);
+    
     back_fluxes.push_back(flux);
     back_mass.push_back(mz);
     back_time.push_back(moment);

Changes of Revision 9