Skip to content
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

Alexey dev issue368: C(s) individual plots, correctly passed limits #148

Merged
merged 2 commits into from
Oct 31, 2024
Merged

Alexey dev issue368: C(s) individual plots, correctly passed limits #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c7123e
GMP : C(s) ranges for indiv. distribs.....
alexsav815 Oct 29, 2024
f72d501
GMP : C(s) ranges for indiv. distribs; passed Aprofile params for min…
alexsav815 Oct 29, 2024
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
11 changes: 11 additions & 0 deletions programs/us_ddist_combine/us_ddist_combine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,6 +1137,7 @@ void US_DDistr_Combine::plot_distr_auto( DistrDesc ddesc, QString distrID, QMap<
QString ranges_p;

qDebug() << "c_ranges, begin -- " << c_parms[ "Ranges" ];
qDebug() << "c_parms.keys() -- " << c_parms.keys();

QMap<QString, QString >::iterator jj;
for ( jj = c_parms.begin(); jj != c_parms.end(); ++jj )
Expand All @@ -1149,6 +1150,16 @@ void US_DDistr_Combine::plot_distr_auto( DistrDesc ddesc, QString distrID, QMap<
xmax_p = jj.value().toDouble();
else if ( jj.key().contains( "Ranges" ) )
ranges_p = jj.value();
else if ( jj.key().contains( "s_ranges" ) )
{
xmin_p = jj.value().split(",")[0].toDouble();
xmax_p = jj.value().split(",")[1].toDouble();
}
else if ( jj.key().contains( "k_ranges" ) )
{
xmin_p = jj.value().split(",")[0].toDouble();
xmax_p = jj.value().split(",")[1].toDouble();
}
}

qDebug() << "In plot_distr_auto(): sigma_p, xmin_p, xmax_p, ranges_p -- "
Expand Down
77 changes: 71 additions & 6 deletions programs/us_reporter_gmp/us_reporter_gmp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5383,9 +5383,10 @@ bool US_ReporterGMP::modelGuidExistsForStage_ind( QString triple_n, QString mode
//Individual Combined Plots
void US_ReporterGMP::process_combined_plots_individual ( QString triplesname_p, QString stage_model )
{
QString triplesname_passed = triplesname_p;
QString filename_passed = get_filename( triplesname_p );
QString triplesname = triplesname_p.replace(".","");

sdiag_combplot = new US_DDistr_Combine( "REPORT" );
QStringList runIDs_single;

Expand Down Expand Up @@ -5420,20 +5421,30 @@ void US_ReporterGMP::process_combined_plots_individual ( QString triplesname_p,

for ( int ii = 0; ii < modelDescModified.size(); ii++ )
{
QString triplesname_mod = triplesname;
QString triplesname_mod = triplesname;
QString triplesname_chann; //Should be "1A:UV/vis." OR "1A:Interf."

if ( triplesname.contains("Interference") )
triplesname_mod = triplesname_mod.replace( "Interference" , "660");
{
triplesname_mod = triplesname_mod.replace( "Interference" , "660");
triplesname_chann = triplesname_passed.split(".")[0] + triplesname_passed.split(".")[1] + ":Interf.";
}
else
triplesname_chann = triplesname_passed.split(".")[0] + triplesname_passed.split(".")[1] + ":UV/vis.";

qDebug() << "INDCOMBO_1: " << modelDescModified[ ii ];
qDebug() << "INDCOMBO_2: " << triplesname << stage_model;

qDebug() << "INDCOMBO_2: " << triplesname << stage_model << triplesname_chann;
//fiter by type|model
if ( modelDescModified[ ii ].contains( triplesname_mod ) &&
modelDescModified[ ii ].contains( stage_model ) &&
modelGuidExistsForStage_ind( triplesname, stage_model, modelDescModifiedGuid[ ii ] ) )
{
qDebug() << "INDCOMBO_3: YES ";

//compose map of [{"s_ranges","k_ranges"}, etc] from cAP2 & cAPp (for given channel & model!!!)
QMap< QString, QStringList > sim_ranges = find_sim_ranges( triplesname_chann, stage_model );

QString t_m = "s," + stage_model;
QMap < QString, QString > c_params = comboPlotsMap[ t_m ];
//ALEXEY: here it plots s20 combPlot (xtype == 0) -- Need to do first thing!!!
Expand Down Expand Up @@ -5484,12 +5495,19 @@ void US_ReporterGMP::process_combined_plots_individual ( QString triplesname_p,
c_parms = comboPlotsMap[ t_m ];
//put ranges into c_parms:
c_parms[ "Ranges" ] = ranges.join(",");

qDebug() << "s-type: sim_ranges.keys(), sim_ranges[\"s_ranges\"] -- "
<< sim_ranges.keys()
<< sim_ranges["s_ranges"];
if ( sim_ranges. contains("s_ranges") )
c_parms[ "s_ranges" ] = sim_ranges["s_ranges"].join(",");


//qDebug() << "over models: c_params -- " << c_params;

//ALEXEY: here it plots s20 combPlot (xtype == 0)
plotted_ids_colors_map_s_type = sdiag_combplot-> changedPlotX_auto( 0, c_parms );

write_plot( imgComb02File, sdiag_combplot->rp_data_plot1() ); //<-- rp_data_plot1() gives combined plot
imgComb02File.replace( svgext, pngext );
CombPlotsFileNames << imgComb02File;
Expand Down Expand Up @@ -5544,6 +5562,9 @@ void US_ReporterGMP::process_combined_plots_individual ( QString triplesname_p,
c_parms = comboPlotsMap[ t_m ];
//put ranges into c_parms:
c_parms[ "Ranges" ] = ranges.join(",");

if ( sim_ranges. contains("k_ranges") )
c_parms[ "k_ranges" ] = sim_ranges["k_ranges"].join(",");

plotted_ids_colors_map_s_type = sdiag_combplot-> changedPlotX_auto( 3, c_parms );

Expand All @@ -5566,6 +5587,50 @@ void US_ReporterGMP::process_combined_plots_individual ( QString triplesname_p,
qApp->processEvents();
}

//pull s_ranges, k_ranges from AProfile
QMap< QString, QStringList > US_ReporterGMP::find_sim_ranges( QString chann_desc, QString model )
{
QMap < QString, QStringList > sim_ranges;

qDebug() << "[in find_sim_ranges()1] -- " << chann_desc << model;

if ( model. contains("2DSA") )
{
//2DSA
for (int i=0; i<cAP2.parms.size(); ++i )
{
QString channame = cAP2.parms[i].channel;
qDebug() << "channame -- " << channame;

if ( channame. contains( chann_desc ) )
{
sim_ranges[ "s_ranges" ] << QString::number( cAP2.parms[i].s_min )
<< QString::number( cAP2.parms[i].s_max );
sim_ranges[ "k_ranges" ] << QString::number( cAP2.parms[i].k_min )
<< QString::number( cAP2.parms[i].k_max );
break;
}
}
}
else if ( model. contains("PCSA") )
{
//PCSA
for (int i=0; i<cAPp.parms.size(); ++i )
{
QString channame = cAPp.parms[i].channel;
if ( channame == chann_desc )
{
sim_ranges[ "s_ranges" ] << QString::number( cAPp.parms[i].x_min )
<< QString::number( cAPp.parms[i].x_max );
sim_ranges[ "y_ranges" ] << QString::number( cAPp.parms[i].y_min )
<< QString::number( cAPp.parms[i].y_max );
break;
}
}
}

return sim_ranges;
}

//Combined Plots
void US_ReporterGMP::process_combined_plots ( QString filename_passed )
Expand Down
1 change: 1 addition & 0 deletions programs/us_reporter_gmp/us_reporter_gmp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,7 @@ class US_ReporterGMP : public US_Widgets
bool modelGuidExistsForStage_ind(QString, QString, QString); //!< Check if model GUID exists for stage (individual)
void process_combined_plots(QString); //!< Process combined plots
void process_combined_plots_individual(QString, QString); //!< Process combined plots (individual)
QMap< QString, QStringList > find_sim_ranges( QString, QString );

QMap<QString, QString> read_autoflowGMPReportEsign_record(QString); //!< Read autoflow GMP report electronic signature record
void get_assigned_oper_revs(QJsonDocument, QStringList&); //!< Get assigned operator revisions
Expand Down