diff --git a/sequencerd/sequencer_interface.cpp b/sequencerd/sequencer_interface.cpp index 810feb63..f8f37e0c 100644 --- a/sequencerd/sequencer_interface.cpp +++ b/sequencerd/sequencer_interface.cpp @@ -360,13 +360,13 @@ namespace Sequencer { { "DECL", mysqlx::Value( dec_dms_in ) }, // DECL { "EPOCH", mysqlx::Value( "J2000" ) }, // EPOCH { "EXPTIME", mysqlx::Value( exptime_in ) }, // EXPTIME - { "OTMexpt", mysqlx::Value( exptime_in ) }, // OTMexpt + { "EXPTIME", mysqlx::Value( exptime_in ) }, // was: OTMexpt { "TARGET_NUMBER", mysqlx::Value( 1 ) }, // TARGET_NUMBER { "SEQUENCE_NUMBER", mysqlx::Value( 1 ) }, // SEQUENCE_NUMBER { "CASANGLE", mysqlx::Value( 0. ) }, // CASANGLE { "OTMcass", mysqlx::Value( 0. ) }, // OTMcass - { "OTMslitangle", mysqlx::Value( slita_in ) }, // OTMslitangle - { "OTMslitwidth", mysqlx::Value( slitw_in ) }, // OTMslitwidth + { "SLITANGLE", mysqlx::Value( slita_in ) }, // was: OTMslitangle + { "SLITWIDTH", mysqlx::Value( slitw_in ) }, // was: OTMslitwidth { "SLITWIDTH", mysqlx::Value( slitw_in ) }, // SLITWIDTH { "SLITOFFSET", mysqlx::Value( 1 ) }, // SLITOFFSET { "BINSPECT", mysqlx::Value( 1 ) }, // BINSPECT @@ -638,8 +638,8 @@ namespace Sequencer { this->offset_dec = extract_column_from_row( "OFFSET_DEC", row ); this->casangle = extract_column_from_row( "OTMcass", row ); - this->slitangle = extract_column_from_row( "OTMslitangle", row ); - this->slitwidth_req = extract_column_from_row( "OTMslitwidth", row ); + this->slitangle = extract_column_from_row( "SLITANGLE", row ); // was: OTMslitangle + this->slitwidth_req = extract_column_from_row( "SLITWIDTH", row ); // was: OTMslitwidth this->slitoffset_req = extract_column_from_row( "SLITOFFSET", row ); // The database stores a field "EXPTIME_REQ" which contains the command to the OTM, @@ -648,7 +648,7 @@ namespace Sequencer { // going to request of the cameras. After the exposure the sequencer will ask the // camera for the actual exposure time, which I call exptime_act. // - this->exptime_req = extract_column_from_row( "OTMexpt", row ); + this->exptime_req = extract_column_from_row( "EXPTIME", row ); // was: OTMexpt this->nexp = extract_column_from_row( "NEXP", row ); diff --git a/sequencerd/sequencer_interface.h b/sequencerd/sequencer_interface.h index f4569e7c..e72fe740 100644 --- a/sequencerd/sequencer_interface.h +++ b/sequencerd/sequencer_interface.h @@ -207,9 +207,9 @@ namespace Sequencer { "OFFSET_RA", "OFFSET_DEC", "NEXP", - "OTMexpt", - "OTMslitwidth", - "OTMslitangle", + "EXPTIME", /* was "OTMexpt", */ + "SLITWIDTH", /* was "OTMslitwidth", */ + "SLITANGLE", /* was "OTMslitangle", */ "SLITOFFSET", "BINSPECT", "BINSPAT",