Open Build Service

turbina-core-mass.changes Changed

turbina-core-mass.spec Changed

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

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

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

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

@@ -1,71 +1,71 @@
 Section "General"
     SubSection "Site"
-        DeviceNumber              MD41  ;device serial number
+        DeviceNumber              MD09  ;device serial number
         SiteName                   KGO  ;observatory or site name
-        Longitude          2 50 40      ;longitude of the site
-        Latitude           +43 44 12    ;latitude of the site
+        Longitude              2 50 40  ;longitude of the site
+        Latitude             +43 44 12  ;latitude of the site
     EndSubSection   
     SubSection "Common"
-        Device           /dev/ttyUSB0   ;
-        BaudeRate               920     ;
+        Device /dev/serial/by-id/usb-FTDI_USB_FAST_SERIAL_ADAPTER_FT8YW47V-if00-port0 ;
+        BaudeRate                  920  ;
     EndSubSection
 EndSection
 Section "Operations"
     SubSection "Normal mode"
-        Exposition              0.5     ;micro-exposition time in ms (>=1)
-        BaseTime                  1     ;base time in sec.
-        AccumTime                60     ;accumulation time in sec.
-        MinimalStarFlux         100     ;For centering control
+        Exposition                 0.5  ;micro-exposure time in ms (>=1)
+        BaseTime                     1  ;base time in sec.
+        AccumTime                   60  ;accumulation time in sec.
+        MinimalStarFlux             80  ;For centering control
     EndSubSection
     SubSection "Background measurement"
-        AccumTime                10     ;full time of the measurement
+        AccumTime                   10  ;full time of the measurement
     EndSubSection
     SubSection "Tests"
-        FluxEstimationTime        4     ; sec
-        ExchangeTestTime          4     ; exchange test duration in sec
-        DetectorTestTime          8     ;
-        DetectorLight            0.1    ; reference light level for detector test
-        TestCounts  1266 838 729 663    ; reference counts into channels
-        FluxTolerance            0.1    ; allowed tolerance for real counts
-        NonPoisTolerance         0.1    ; allowed tolerance for non
-        StatisticLight           0.1    ; light levels for statistical test
-        Modulation               0.1    ; modulation amplitude for statisti
-        CountingLight            0.06   ;
+          FluxEstimationTime         4  ;sec
+        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
+        FluxTolerance              0.2  ;allowed tolerance for real counts
+        NonPoisTolerance           0.2  ;allowed tolerance for non
+          StatisticLight           0.1  ;light levels for statistical test
+        Modulation                 0.1  ;modulation amplitude for statisti
+        CountingLight             0.07  ;
     EndSubSection
 EndSection
 Section "Devices"
     SubSection "Bicounter 1"
-        Module                  0x01    ;module unique address
+        Module                    0x01  ;module unique address
         PMTNumberA              AJ4384  ;PMT serial number
         PMTNumberB              AJ4573  ;PMT serial number
-        Identification    0x01 0x06 0x9d 0x03 ;
-        DiscriminationA         0.4     ;
-        DiscriminationB         0.4     ;
-        NonLinearityA           16.6    ;
-        NonLinearityB           17.7    ;
-        NonPoissonA             1.033   ;
-        NonPoissonB             1.016   ;
+        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  ;
     EndSubSection
     SubSection "Bicounter 2"
-        Module                  0x02
-        PMTNumberA              AH7806
+        Module                    0x02  ;
+        PMTNumberA              AH7806  ;
         PMTNumberB              AJ4567  ;PMT serial number
-        Identification   0x01 0x06 0x9d 0x03
-        DiscriminationA         0.4     ;
-        DiscriminationB         0.4     ;
-        NonLinearityA           19.9    ;
-        NonLinearityB           16.5    ;
-        NonPoissonA             1.017   ;
-        NonPoissonB             1.014   ;
+        Identification    0x01 0x06 0x9d 0x03
+        DiscriminationA            1.1  ;
+        DiscriminationB            1.1  ;
+        NonLinearityA             18.0  ;
+        NonLinearityB             17.0  ;
+        NonPoissonA              1.027  ;
+        NonPoissonB              1.038  ;
     EndSubSection
     SubSection "Auxiliary"
-        Module                0x10
-        Identification    0x01 0x08 0x03 0x09;
-        HighVoltage             750     ;default high voltage level, V
-        PollingTime             100     ;temperature polling period in s
-        IlluminationLevel       0.2     ;default illumination leve
-        HVsteadying             20      ;sec
-        LightSteadying          5       ;sec
+        Module                    0x10  ;
+        Identification        0x01 0x08 0x03 0x09
+        HighVoltage                750  ;default high voltage level, V
+        PollingTime                100  ;temperature polling period in s
+        IlluminationLevel          0.5  ;default illumination leve
+        HVsteadying                 20  ;sec
+        LightSteadying               5  ;sec
     EndSubSection
 EndSection
 Section "Channels"
@@ -75,10 +75,16 @@
         ChannelC            Counter 1A  ;counter for Channel C
         ChannelD            Counter 1B  ;counter for Channel D
     EndSubSection
+    SubSection "Scatter"
+        ChannelB                 0.06   ; defined 12.08.16
+    EndSubSection
+    SubSection "Rconstant"
+        ChannelC                 8.04   ; starting from 25.08.16
+    EndSubSection
 EndSection
 Section "Optics"
     SubSection "Common"
-        Magnification           15.20   ;magnification factor of the device
+        Magnification           16.20   ;magnification factor of the device
     EndSubSection
     SubSection "Segment A"
         Inner                   0.00    ;

turbina_core_m-1.28.tar.bz2/etc/mass_md09.cfg -> turbina_core_m-1.29.tar.bz2/etc/mass_md09.cfg Changed

@@ -2,70 +2,70 @@
     SubSection "Site"
         DeviceNumber              MD09  ;device serial number
         SiteName                   KGO  ;observatory or site name
-        Longitude          2 50 40      ;longitude of the site
-        Latitude           +43 44 12    ;latitude of the site
+        Longitude              2 50 40  ;longitude of the site
+        Latitude             +43 44 12  ;latitude of the site
     EndSubSection   
     SubSection "Common"
-        Device           /dev/rs485lpt0 ;
-        BaudeRate               920     ;
+        Device /dev/serial/by-id/usb-FTDI_USB_FAST_SERIAL_ADAPTER_FT8YW47V-if00-port0 ;
+        BaudeRate                  920  ;
     EndSubSection
 EndSection
 Section "Operations"
     SubSection "Normal mode"
-        Exposition              0.5     ;micro-exposition time in ms (>=1)
-        BaseTime                  1     ;base time in sec.
-        AccumTime                60     ;accumulation time in sec.
-        MinimalStarFlux          80     ;For centering control
+        Exposition                 0.5  ;micro-exposure time in ms (>=1)
+        BaseTime                     1  ;base time in sec.
+        AccumTime                   60  ;accumulation time in sec.
+        MinimalStarFlux             80  ;For centering control
     EndSubSection
     SubSection "Background measurement"
-        AccumTime                10     ;full time of the measurement
+        AccumTime                   10  ;full time of the measurement
     EndSubSection
     SubSection "Tests"
-          FluxEstimationTime        4     ;sec
-        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
-        FluxTolerance           0.2     ;allowed tolerance for real counts
-        NonPoisTolerance        0.2     ;allowed tolerance for non
-          StatisticLight          0.1     ;light levels for statistical test
-        Modulation              0.1     ;modulation amplitude for statisti
-        CountingLight           0.07     ;
+          FluxEstimationTime         4  ;sec
+        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
+        FluxTolerance              0.2  ;allowed tolerance for real counts
+        NonPoisTolerance           0.2  ;allowed tolerance for non
+          StatisticLight           0.1  ;light levels for statistical test
+        Modulation                 0.1  ;modulation amplitude for statisti
+        CountingLight             0.07  ;
     EndSubSection
 EndSection
 Section "Devices"
     SubSection "Bicounter 1"
-        Module                  0x01    ;module unique address
+        Module                    0x01  ;module unique address
         PMTNumberA              AJ4384  ;PMT serial number
         PMTNumberB              AJ4573  ;PMT serial number
         Identification    0x01 0x06 0x9d 0x03
-        DiscriminationA         1.0 ; 0.45     ;
-        DiscriminationB         1.0 ; 0.45     ;
-        NonLinearityA           18.0    ;
-        NonLinearityB           18.0    ;
-        NonPoissonA             1.028   ;
-        NonPoissonB             1.039   ;
+        DiscriminationA            1.1  ;inverse value
+        DiscriminationB            1.1  ;inverse value
+        NonLinearityA             18.0  ;
+        NonLinearityB             18.0  ;
+        NonPoissonA              1.028  ;
+        NonPoissonB              1.039  ;
     EndSubSection
     SubSection "Bicounter 2"
-        Module                  0x02
-        PMTNumberA              AH7806
+        Module                    0x02  ;
+        PMTNumberA              AH7806  ;
         PMTNumberB              AJ4567  ;PMT serial number
-        Identification    0x01 0x06 0x5b 0x1a
-        DiscriminationA         1.0 ; 0.45     ;
-        DiscriminationB         1.0 ; 0.55     ;
-        NonLinearityA           18.0    ;
-        NonLinearityB           17.0    ;
-        NonPoissonA             1.027   ;
-        NonPoissonB             1.038   ;
+        Identification    0x01 0x06 0x9d 0x03
+        DiscriminationA            1.1  ;
+        DiscriminationB            1.1  ;
+        NonLinearityA             18.0  ;
+        NonLinearityB             17.0  ;
+        NonPoissonA              1.027  ;
+        NonPoissonB              1.038  ;
     EndSubSection
     SubSection "Auxiliary"
-        Module                0x10
-        Identification      0x19 0x08 0x03 0x09
-        HighVoltage             750     ;default high voltage level, V
-        PollingTime             100     ;temperature polling period in s
-        IlluminationLevel       0.5     ;default illumination leve
-        HVsteadying             20      ;sec
-        LightSteadying          5       ;sec
+        Module                    0x10  ;
+        Identification        0x01 0x08 0x03 0x09
+        HighVoltage                750  ;default high voltage level, V
+        PollingTime                100  ;temperature polling period in s
+        IlluminationLevel          0.5  ;default illumination leve
+        HVsteadying                 20  ;sec
+        LightSteadying               5  ;sec
     EndSubSection
 EndSection
 Section "Channels"
@@ -75,6 +75,9 @@
         ChannelC            Counter 1A  ;counter for Channel C
         ChannelD            Counter 1B  ;counter for Channel D
     EndSubSection
+    SubSection "Scatter"
+	ChannelB		0.06	; defined 12.08.16
+    EndSubSection
 EndSection
 Section "Optics"
     SubSection "Common"

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

@@ -36,7 +36,8 @@
     double basetime = 1;
     double nacctime = 60;
     double bacctime = 10;
-    double instrumental_constant = 9.0;
+    double instrumental_constant = 8.0;
+    bool is_history = false;
     std::string  file_history_name = "constant.dat";
     bool parm_is_set = false;
 }
@@ -95,6 +96,7 @@
     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");
+    static std::string instrumental_c_key("channels/rconstant/channelc");
     exposure = get<double>( ::get( rPs, expos_key ) );
     basetime = get<double>( ::get( rPs, btime_key ) );
     nacctime = get<double>( ::get( rPs, atime_key ) );
@@ -107,6 +109,7 @@
     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 ) );
+    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;
     return parm_is_set;
@@ -138,7 +141,7 @@
 }
 
 double parameters::instrument_constant( double back ) {
-    instrumental_constant = 0.9*instrumental_constant + 0.1*back;
+    instrumental_constant = 0.93*instrumental_constant + 0.07*back;
     return instrumental_constant;
 }
 
@@ -151,19 +154,24 @@
 //    file_history_name = program_etc + "history" + extension_history;
 
     history.open( file_history_name.c_str(), std::ios::in );
-    if( !history )throw std::ios_base::failure( "No constant.dat file: " ); 
-    std::string str;
-    while( getline( history, str ) ){
-        std::istringstream is(str);
-        is >> date >> time >> val;
+    if( history ) {
+//        throw std::ios_base::failure( "No constant.dat file: " ); 
+        std::string str;
+        while( getline( history, str ) ){
+            std::istringstream is(str);
+            is >> date >> time >> val;
+        }
+        instrumental_constant = val;
+        is_history = true;
     }
-    instrumental_constant = val;
 }
 
 void parameters::new_instrument_constant( Date& date, Time& time ) {
+    if( is_history ) {
         std::ofstream history;
         std::ostringstream outstr;
         history.open( file_history_name.c_str(), std::ios::app );
         history << date << ' ' << time  << ' ' << "  \t" << std::fixed << std::setprecision(3) << instrumental_constant << std::endl;
         history.close();
+    }
 }

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

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

@@ -22,7 +22,9 @@
 const unsigned int window = 2;
 const double mindelta = 0.25;
 const double mintime = 6.0/60.0/24.0 ;
-const double plimits = 0.05;
+const double plimits = 0.1;
+
+const int chan = 2; // C aperture
 
 struct photo {
     std::string name;
@@ -45,7 +47,7 @@
     std::vector< double > star_time;
     std::vector< double > back_mass;
     std::vector< double > star_mass;
-    double extinct = 0.2;
+    double extinct = 0.23;
     bool star_is = false;
     
 }
@@ -61,9 +63,9 @@
     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" );
+    if( poiss(chan) > poiss0(chan) + plimits ) throw std::ios_base::failure( "This is no background measurement" );
                     // c+d apertures
-    double flux  =  fluxes(2) + fluxes(3);
+    double flux  =  fluxes(chan);
     
     back_fluxes.push_back(flux);
     back_mass.push_back(mz);
@@ -107,7 +109,7 @@
     vector< double> corr = element_prod( tau, fluxes ); 
     fluxes = fluxes + element_prod( fluxes, corr );
                     //background
-    double flux  =  fluxes(2) + fluxes(3) - current_background;
+    double flux  =  fluxes(chan) - current_background;
     star_fluxes.push_back(flux);
     star_mass.push_back(mz);
     star_time.push_back(moment);
@@ -140,7 +142,7 @@
 //        std::cerr << Date( floor(now.moment)) << ' ' << Time( 24*(now.moment-floor(now.moment)) ) 
 //                 << " " << prevs_star.name << " " <<  now.name << " Ext " 
 //                 << ext_est <<  " DeltaMz " <<  prevs_star.mz - now.mz << " R " << rconst << std::endl;
-        if( std::abs( ext_est - extinct ) < 0.05 ) parameters::instrument_constant( rconst );
+        if( std::abs( ext_est - extinct ) < 0.1 ) parameters::instrument_constant( rconst );
         rstr << "R " << Date( floor(now.moment)) << ' ' << Time( 24*(now.moment-floor(now.moment)) ) << "  " 
              << std::fixed << std::setprecision(3) << ext_est  << " " << now.mz << " " << rconst << " " << parameters::instrument_constant();
         std::cout << rstr.str() << std::endl;

Changes of Revision 10