Skip to content

substitute database column usage #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astronomerdave merged 1 commit into from
May 20, 2026
Merged

substitute database column usage #440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions sequencerd/sequencer_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -638,8 +638,8 @@ namespace Sequencer {
this->offset_dec = extract_column_from_row<double>( "OFFSET_DEC", row );

this->casangle = extract_column_from_row<double>( "OTMcass", row );
this->slitangle = extract_column_from_row<double>( "OTMslitangle", row );
this->slitwidth_req = extract_column_from_row<double>( "OTMslitwidth", row );
this->slitangle = extract_column_from_row<double>( "SLITANGLE", row ); // was: OTMslitangle
this->slitwidth_req = extract_column_from_row<double>( "SLITWIDTH", row ); // was: OTMslitwidth
this->slitoffset_req = extract_column_from_row<double>( "SLITOFFSET", row );

// The database stores a field "EXPTIME_REQ" which contains the command to the OTM,
Expand All @@ -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<double>( "OTMexpt", row );
this->exptime_req = extract_column_from_row<double>( "EXPTIME", row ); // was: OTMexpt

this->nexp = extract_column_from_row<int>( "NEXP", row );

Expand Down
6 changes: 3 additions & 3 deletions sequencerd/sequencer_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading