diff --git a/src/daqd/circ.h b/src/daqd/circ.h
index eb2d7cc614bca93d2ad535cb0aa9608714471a8c..e376284acdc84566b0beeabe0a84b3be0d0e2efd 100644
--- a/src/daqd/circ.h
+++ b/src/daqd/circ.h
@@ -22,7 +22,6 @@ typedef struct
unsigned int run; ///< Run number
time_t gps, gps_n; ///< GPS system timestamp is seconds and nanosec residual
unsigned long seq_num; ///< Set to `puts' value when created
- int leap_seconds; ///< TAI-UTC for this data block
int altzone; ///< Local seasonal time minus UTC (negative for USA)
#ifndef NO_BROADCAST
int gds_signal_refresh;
diff --git a/src/daqd/comm.y b/src/daqd/comm.y
index 8f5a0069cf07ebfc1685b78090d8afc5302dd260..fc5aefe29671731b055c030ce6d47229adf3b51f 100644
--- a/src/daqd/comm.y
+++ b/src/daqd/comm.y
@@ -347,27 +347,7 @@ CommandLine: /* Nothing */
daqd.do_fsync = $4;
}
| SET GPS_LEAPS '=' INTNUM OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum OptionalIntnum {
- // Assign all leapseconds; 0 is assigned if unspecified
- daqd.gps_leaps[0] = $4;
- daqd.gps_leaps[1] = $5;
- daqd.gps_leaps[2] = $6;
- daqd.gps_leaps[3] = $7;
- daqd.gps_leaps[4] = $8;
- daqd.gps_leaps[5] = $9;
- daqd.gps_leaps[6] = $10;
- daqd.gps_leaps[7] = $11;
- daqd.gps_leaps[8] = $12;
- daqd.gps_leaps[9] = $13;
- daqd.gps_leaps[10] = $14;
- daqd.gps_leaps[11] = $15;
- daqd.gps_leaps[12] = $16;
- daqd.gps_leaps[13] = $17;
- daqd.gps_leaps[14] = $18;
- daqd.gps_leaps[15] = $19;
-
- for (daqd.nleaps = 0;
- daqd.nleaps < 16 && daqd.gps_leaps[daqd.nleaps];
- daqd.nleaps++);
+ // This is a no-op now. This gps leapseconds come from the ldas tools code automatically.
}
| SET PARALLEL_PRODUCERS '=' INTNUM {
diff --git a/src/daqd/daqd.cc b/src/daqd/daqd.cc
index 17f87687ce890ea5bb3b37f4747f9887d64d71cf..207d06c5e5f43169a2676a1993d3821a63e16727 100644
--- a/src/daqd/daqd.cc
+++ b/src/daqd/daqd.cc
@@ -1168,7 +1168,7 @@ daqd_c::framer( int science )
time_t frame_start;
unsigned int run;
time_t gps, gps_n;
- int altzone, leap_seconds;
+ int altzone;
struct tm tms;
time_t tdata = time( 0 );
@@ -1215,7 +1215,6 @@ daqd_c::framer( int science )
gps = prop->prop.gps;
gps_n = prop->prop.gps_n;
altzone = prop->prop.altzone;
- leap_seconds = prop->prop.leap_seconds;
// frame_start = prop -> timestamp;
frame_start = gps;
@@ -1350,7 +1349,6 @@ daqd_c::framer( int science )
*/
cur_buf->frame->SetGTime( FrameCPP::Version::GPSTime( gps, gps_n ) );
- // frame -> SetULeapS(leap_seconds);
DEBUG( 1,
cerr << "adding frame @ " << gps << " to "
diff --git a/src/daqd/daqd.hh b/src/daqd/daqd.hh
index dbf9b3da7033105485c2dbf1fed6f7585f682c77..e02601ddd52dee674665622a735269cfeb0a5185 100644
--- a/src/daqd/daqd.hh
+++ b/src/daqd/daqd.hh
@@ -269,10 +269,10 @@ public:
frames_per_file( 1 ), blocks_per_frame( 1 ), cksum_file( (char*)"" ),
zero_bad_data( 1 ), master_config( (char*)"" ),
broadcast_config( (char*)"" ), crc_debug( 0 ), cit_40m( 0 ),
- nleaps( 0 ), do_fsync( 0 ), do_directio( 0 ),
- controller_dcu( DCU_ID_SUS_1 ), avoid_reconnect( 0 ), tp_allow( -1 ),
- no_myrinet( 0 ), allow_tpman_connect_failure( 0 ),
- no_compression( 0 ), symm_gps_offset( 0 ), cycle_delay( 4 ),
+ do_fsync( 0 ), do_directio( 0 ), controller_dcu( DCU_ID_SUS_1 ),
+ avoid_reconnect( 0 ), tp_allow( -1 ), no_myrinet( 0 ),
+ allow_tpman_connect_failure( 0 ), no_compression( 0 ),
+ symm_gps_offset( 0 ), cycle_delay( 4 ),
old_raw_minute_trend_dirs( "" ),
_checksum_file_transform_initted( false )
@@ -700,20 +700,6 @@ public:
/// 40M flag
int cit_40m;
- /// leapseconds table
- unsigned int gps_leaps[ 16 ]; ///< gps leap seconds
- int nleaps; ///< leapseconds table size
-
- inline unsigned int
- gps_leap_seconds( unsigned int gps_time )
- {
- unsigned int leaps = LEAP_SECONDS;
- for ( int i = 0; i < nleaps; i++ )
- if ( gps_time >= gps_leaps[ i ] )
- leaps++;
- return leaps;
- }
-
/// Whether to do fsync() calls or not when saving raw minute trend files
int do_fsync;
diff --git a/src/daqd/producer_shmem.cc b/src/daqd/producer_shmem.cc
index fcd530a71aa10db3b0cc11c5684dc0cdd1aa2790..2e75e97d12e4bffa34760e2d37b4bc177f7d195a 100644
--- a/src/daqd/producer_shmem.cc
+++ b/src/daqd/producer_shmem.cc
@@ -664,7 +664,6 @@ producer::frame_writer( )
cur_prop->gps_n = 1000000000 / 16 * ( i % 16 );
// printf("before put %d %d %d\n", prop.gps, prop.gps_n, frac);
- cur_prop->leap_seconds = daqd.gps_leap_seconds( gps );
// std::cout << "about to call put16th_dpscattered with " << vmic_pv_len
// << " entries. prop.gps = " << prop.gps << " prop.gps_n = " <<