Open Build Service

turbina-core-mass.changes Changed

turbina-core-mass.spec Changed

turbina_core_m-1.29.tar.bz2/.hg_archival.txt -> turbina_core_m-1.30.tar.bz2/.hg_archival.txt Changed

turbina_core_m-1.29.tar.bz2/.hgtags -> turbina_core_m-1.30.tar.bz2/.hgtags Changed

turbina_core_m-1.29.tar.bz2/Makefile -> turbina_core_m-1.30.tar.bz2/Makefile Changed

turbina_core_m-1.29.tar.bz2/etc/mass.cfg -> turbina_core_m-1.30.tar.bz2/etc/mass.cfg Changed

@@ -25,7 +25,7 @@
         ExchangeTestTime            10  ;exchange test duration in sec
           DetectorTestTime           8  ;
           DetectorLight           0.25  ;reference light level for detector test
-          TestCounts 1195 3063 4274 1291 ;reference counts into channels
+          TestCounts 1260  3720 5100 1440 ;reference counts into channels
         FluxTolerance              0.2  ;allowed tolerance for real counts
         NonPoisTolerance           0.2  ;allowed tolerance for non
           StatisticLight           0.1  ;light levels for statistical test
@@ -41,10 +41,10 @@
         Identification    0x01 0x06 0x9d 0x03
         DiscriminationA            1.1  ;inverse value
         DiscriminationB            1.1  ;inverse value
-        NonLinearityA             18.0  ;
-        NonLinearityB             18.0  ;
-        NonPoissonA              1.028  ;
-        NonPoissonB              1.039  ;
+        NonLinearityA             20.6  ;
+        NonLinearityB             20.0  ;
+        NonPoissonA              1.024  ;
+        NonPoissonB              1.035  ;
     EndSubSection
     SubSection "Bicounter 2"
         Module                    0x02  ;
@@ -53,10 +53,10 @@
         Identification    0x01 0x06 0x9d 0x03
         DiscriminationA            1.1  ;
         DiscriminationB            1.1  ;
-        NonLinearityA             18.0  ;
-        NonLinearityB             17.0  ;
-        NonPoissonA              1.027  ;
-        NonPoissonB              1.038  ;
+        NonLinearityA             23.5  ;
+        NonLinearityB             20.2  ;
+        NonPoissonA              1.038  ;
+        NonPoissonB              1.040  ;
     EndSubSection
     SubSection "Auxiliary"
         Module                    0x10  ;
@@ -65,7 +65,7 @@
         PollingTime                100  ;temperature polling period in s
         IlluminationLevel          0.5  ;default illumination leve
         HVsteadying                 20  ;sec
-        LightSteadying               5  ;sec
+        LightSteadying              30  ;sec
     EndSubSection
 EndSection
 Section "Channels"
@@ -76,7 +76,7 @@
         ChannelD            Counter 1B  ;counter for Channel D
     EndSubSection
     SubSection "Scatter"
-        ChannelB                 0.06   ; defined 12.08.16
+	ChannelB		0.06	; defined 12.08.16
     EndSubSection
     SubSection "Rconstant"
         ChannelC                 8.04   ; starting from 25.08.16

turbina_core_m-1.29.tar.bz2/measmode.cpp -> turbina_core_m-1.30.tar.bz2/measmode.cpp Changed

@@ -18,6 +18,9 @@
 const std::string StatMeasModeName = "Statistic measurement";
 const std::string CountMeasModeName = "Counting measurement";
 
+const bool nstring =  true;             // true for n string output
+
+
 MeasMode::MeasMode(const std::string& modename, Instrument& instr_) :  mname(modename), instr(instr_), minDflux(0) {
 }
 
@@ -64,7 +67,7 @@
 //            vars = result_data.s0*exposition;
 //            throw ErrFat( ERR_CCD_EMPTY, mname );
         }       
-//        pre_processing( count_data );                     // for n string set half of exposure
+        if( nstring ) pre_processing( count_data );                     // for n string set half of exposure
         outdata( result_data, false );                      // output base-time data
         result_data_accum += result_data;
         particular_processing( count_data, result_data );   // for s strings
@@ -129,6 +132,7 @@
     accumTime = config.inp<int>("operations", mname, "accumtime");
     baseTime = config.inp<int>("operations", NormalModeName, "basetime");
     exposition = config.inp<double>("operations", NormalModeName, "exposition");
+    if( nstring ) exposition = 0.5*exposition;                     // For n string
     minDflux = config.inp<double>("operations", NormalModeName, "MinimalStarFlux");
     calcValues();
 }

turbina_core_m-1.29.tar.bz2/parameter_set.cpp -> turbina_core_m-1.30.tar.bz2/parameter_set.cpp Changed

@@ -31,7 +31,7 @@
     double scale  = 2.9670597216e-06;
     std::vector< point<double> > crv;
     vector< double > tau( 4 );
-    vector< double > p( 4 );
+    vector< double > poiss( 4 );
     double exposure = 1.0;
     double basetime = 1;
     double nacctime = 60;
@@ -105,10 +105,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 ) );
+    poiss(0)   =   get<double>( ::get( rPs, nopois_a_key ) );
+    poiss(1)   =   get<double>( ::get( rPs, nopois_b_key ) );
+    poiss(2)   =   get<double>( ::get( rPs, nopois_c_key ) );
+    poiss(3)   =   get<double>( ::get( rPs, nopois_d_key ) );
     if( !is_history ) instrumental_constant = get<double>( ::get( rPs, instrumental_c_key ) );
 //    std::cerr << "Exp " << exposure << " Bt " << basetime << " NA " << nacctime << " BA " << bacctime << std::endl;
     parm_is_set = true;
@@ -120,7 +120,7 @@
 }
 
 vector <double>& parameters::p0() {
-    return p;
+    return poiss;
 }
 
 void parameters::P_line_parse( const std::string& p, const std::string& s ){

turbina_core_m-1.29.tar.bz2/processing.cpp -> turbina_core_m-1.30.tar.bz2/processing.cpp Changed

@@ -53,6 +53,8 @@
 }
 
 unsigned int processing::add_background( const std::string& s, double mz, double moment ) {
+    static bool optics_are_set = parameters::mass_set();
+    if( !optics_are_set ) throw std::ios_base::failure( "Parameter setting fails" ); 
     std::istringstream  istr( s );
     vector< double > fluxes( 4 );
     vector< double > vars( 4 );
@@ -60,8 +62,11 @@
     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;
+    vector< double > poiss0 = parameters::p0();
+//    std::cout << "P " <<  Date( floor(moment)) << ' ' << Time( 24*(moment-floor(moment)) ) <<  " "  << std::fixed << std::setprecision(4) 
+//              << poiss(0) << " " << poiss(1) << " " << poiss(2) << " " << poiss(3) << " " 
+//              << poiss0(0) << " " << poiss0(1) << " " << poiss0(2) << " " << poiss0(3) << " "
+//              << std::endl;
     
     if( poiss(chan) > poiss0(chan) + plimits ) throw std::ios_base::failure( "This is no background measurement" );
                     // c+d apertures
@@ -96,13 +101,15 @@
 }
 
 unsigned int processing::add_data( const std::string& s, double mz, double moment   ) {
+    static bool optics_are_set = parameters::mass_set();
+    if( !optics_are_set ) throw std::ios_base::failure( "Parameter setting fails" ); 
+
     std::istringstream  istr( s );
     std::ostringstream  estr;
     vector< double > fluxes( 4 );
     vector< double > vars( 4 );
     istr >> fluxes >> vars;
     if( istr.eof() || istr.fail() ) throw std::ios_base::failure( "Star moments input fail" ); 
-    parameters::mass_set();  
                     // verification
                     // Nonlinearity
     vector< double > tau(parameters::const_tau()/parameters::expos());
@@ -122,7 +129,6 @@
 
 
 unsigned int processing::run_star() {
-  //      static bool optics_are_set = parameters::mass_set();
     unsigned int numb = 0;
     photo now;
     if( (numb = star_fluxes.size()) == 0 ) return 0;

Changes of Revision 11