Request 87 (accepted)

Overview

Request 87 (accepted)

- Version 1.31

Created by matwey about 8 years ago
In state accepted

Submit turbina-core-mass

Submit package home:matwe...nches:mass / turbina-core-mass to package mass / turbina-core-mass

turbina-core-mass.changes Changed

turbina-core-mass.spec Changed

_service Added

turbina_core_m-1.30.tar.bz2/.hg_archival.txt Deleted

turbina_core_m-1.30.tar.bz2/.hgsub Deleted

turbina_core_m-1.30.tar.bz2/.hgsubstate Deleted

turbina_core_m-1.30.tar.bz2/.hgtags Deleted

turbina_core_m-1.30.tar.bz2/infras/.hgtags Deleted

@@ -1,32 +0,0 @@
-01e464286edc36ad99fb10a2d4c994cd6fe408f2 ameba-0_58
-01e464286edc36ad99fb10a2d4c994cd6fe408f2 dome-1_23
-01e464286edc36ad99fb10a2d4c994cd6fe408f2 mokko-v1
-01e464286edc36ad99fb10a2d4c994cd6fe408f2 monitor-1_29
-2ba85c63ef00b7e14a329248c4194c551d15c960 ameba-0-49
-31f3e4725f5de92e8a8e9cb768c883ad992e46d8 ameba-0_21
-3b70b4af4eac10e493bb52242698fe983707bcdb dome-1_01
-498eca265f129013c09828f58c9a80087a572cb3 dimm-2_11
-4f6471d0b795ab6afab2dacf69b1dcdf67294d2d tlsp-0_20
-5433368217003ff8568b1952e217d5e5804ffd6e turb-0_2
-5f2bc6b675a1b282d79c9d18c54ae3342df932ad tlsp-0_15
-619ddedc25fdbbdd896eb398b421ed6d14aa4870 begin
-64bb84845b2799cd72cbf384d8c9fc2e24704ebe ameba-0_57
-64bb84845b2799cd72cbf384d8c9fc2e24704ebe dimm-2_33
-6d962bd1c2cd184bf39ed96aac0c1ff2444054c3 dimm-2_26
-6d962bd1c2cd184bf39ed96aac0c1ff2444054c3 dome-1_19
-6d962bd1c2cd184bf39ed96aac0c1ff2444054c3 monitor-1_07
-72e27a05f3e9b9782b9e757788074403df1f1cd2 monitor-1_31
-72e27a05f3e9b9782b9e757788074403df1f1cd2 monitor-1_32
-7dd7c2a765f9be0ccd6436ebbecfb341a4994b1b dome-1_03
-819f0950d6a58e68902cf37bef9011826095ae61 tlsp-0_13
-8609d5073806cfdd04aaf380553cc5499fae53e6 ameba-0_40
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff ameba-0_59
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff ameba-0_60
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff ameba-0_61
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff ameba-0_62
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff dimm-2_45
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff dimm-2_46
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff dome-1_24
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff monitor-1_30
-d2fadec4b7b176044ac4431c5ad1ec2e41fd28ff turbina_core_m-1_20
-ecb66a74160bc8bcc9ece732712a929c7a7ff91f ameba-0_12

turbina_core_m-1.30.tar.bz2/server/.hgtags Deleted

@@ -1,32 +0,0 @@
-135764085dd15a107663c0a9154f36b809dc1923 dimm-2_11
-223e2569e1e84bdfc59542ae6e0931095f7437c2 mokko-v1
-560beaa379df8f40a7938bf59bbdefcf1ea4069c ameba-0_40
-68283fd7395f38c1d558df678859fcae41deaa7e dimm-2_26
-68283fd7395f38c1d558df678859fcae41deaa7e dome-1_19
-68283fd7395f38c1d558df678859fcae41deaa7e monitor-1_07
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc ameba-0_59
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc ameba-0_60
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc ameba-0_61
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc ameba-0_62
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc dimm-2_45
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc dimm-2_46
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc dome-1_24
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc monitor-1_30
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc monitor-1_31
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc monitor-1_32
-6c17fce2bf56e1dc148198c3e3e587fc7a1be9bc turbina_core_m-1_20
-863e6af94a47c115b3d827cfaf005cd8e752d204 ameba-0_58
-863e6af94a47c115b3d827cfaf005cd8e752d204 dome-1_23
-863e6af94a47c115b3d827cfaf005cd8e752d204 monitor-1_29
-9ad9ff9be3b2de132db5dfd288f7e1a924fdeb92 dome-1_01
-9ad9ff9be3b2de132db5dfd288f7e1a924fdeb92 dome-1_03
-9ad9ff9be3b2de132db5dfd288f7e1a924fdeb92 start
-9ad9ff9be3b2de132db5dfd288f7e1a924fdeb92 tlsp-0_13
-9ad9ff9be3b2de132db5dfd288f7e1a924fdeb92 tlsp-0_15
-9ad9ff9be3b2de132db5dfd288f7e1a924fdeb92 tlsp-0_20
-9ad9ff9be3b2de132db5dfd288f7e1a924fdeb92 turb-0_2
-c0176904c8f0c48296e12e38241ef8736845ae78 ameba-0_57
-c0176904c8f0c48296e12e38241ef8736845ae78 dimm-2_33
-f1364cffaebd1d89de39da4ec627748e59eb3193 ameba-0-49
-f4d1b12c5ecf742b786ee57c4ae78b0e39f9bf6a ameba-0_12
-f4d1b12c5ecf742b786ee57c4ae78b0e39f9bf6a ameba-0_21

turbina_core_m-1.31.tar.bz2/. Added

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

turbina_core_m-1.31.tar.bz2/data Added

turbina_core_m-1.31.tar.bz2/data/log Added

turbina_core_m-1.31.tar.bz2/data/out Added

turbina_core_m-1.31.tar.bz2/etc Added

turbina_core_m-1.31.tar.bz2/infras Added

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

@@ -30,6 +30,12 @@
     n_run = (int)floor( accumTime/baseTime );
 }
 
+void MeasMode::calcValues( double ex ) {
+    blockNumber = (int)floor( S2MS*baseTime/ex/Instrument::getCountInBlock());
+    exposNumber = blockNumber*Instrument::getCountInBlock();
+    n_run = (int)floor( accumTime/baseTime );
+}
+
 void MeasMode::outdata(RESULT_DATA& result_data, bool is_accum_time) {
     Result::instance().outdata(result_data, is_accum_time);
 }
@@ -45,7 +51,7 @@
     Result::instance().outmode(mname);
     instr.checkStatus();
     instr.waitHV();
-    instr.prepareAccumTime(exposition, exposNumber, baseTime, blockNumber);
+    instr.prepareAccumTime( (nstring)? 0.5*exposition : exposition, exposNumber, baseTime, blockNumber );
 
     for( unsigned int i = 0; i < n_run && further_now(); i++ ) {
         instr.startBaseTime( false );
@@ -57,6 +63,7 @@
             continue;
         }
 //        instr.checkStatus();
+        if( nstring ) pre_processing( count_data );                     // for n string set half of exposure
         sci::calcmom( count_data, result_data );
         Result::instance().outcnt( count_data );
         if(result_data.m3 < minDflux*exposition) {
@@ -67,7 +74,6 @@
 //            vars = result_data.s0*exposition;
 //            throw ErrFat( ERR_CCD_EMPTY, mname );
         }       
-        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
@@ -132,9 +138,8 @@
     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();
+    calcValues(( nstring)? 0.5*exposition : exposition );
 }
 
 void Normal::pre_processing( valarray<COUNT_T>& count_data ) {

turbina_core_m-1.30.tar.bz2/measmode.h -> turbina_core_m-1.31.tar.bz2/measmode.h Changed

turbina_core_m-1.31.tar.bz2/server Added

Build Results
RPM Lint

Refresh

Comments for request 87 0

Request History

matwey created request about 8 years ago

- Version 1.31

matwey accepted request about 8 years ago