From 9f0b603fa30ebb9cf271d3101c9f7b50748cf732 Mon Sep 17 00:00:00 2001 From: alexsav815 Date: Tue, 22 Oct 2024 17:35:01 -0500 Subject: [PATCH 1/5] GMP : Reporting Averages over Replicates for all Optics types -- attemp to resolve, will be tested on Workshop DB for specifically created combo-run out of uploaded form disk data... --- programs/us_reporter_gmp/us_reporter_gmp.cpp | 22 +++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/programs/us_reporter_gmp/us_reporter_gmp.cpp b/programs/us_reporter_gmp/us_reporter_gmp.cpp index e64a56a95..ffa3f5376 100644 --- a/programs/us_reporter_gmp/us_reporter_gmp.cpp +++ b/programs/us_reporter_gmp/us_reporter_gmp.cpp @@ -7520,12 +7520,15 @@ QString US_ReporterGMP::calc_replicates_averages( void ) for( int i=0; i US_ReporterGMP::get_replicate_group_results( US_ReportGMP: { QString channel_desc_alt = chndescs_alt[ j ]; - //For now, do not consider IP type!!! - if ( channel_desc_alt.contains("Interf") ) - continue; + // //For now, do not consider IP type!!! + // if ( channel_desc_alt.contains("Interf") ) + // continue; - if ( channel_desc_alt.split(":")[0].contains( channs_for_wvl[ i ] ) ) + //if ( channel_desc_alt.split(":")[0].contains( channs_for_wvl[ i ] ) ) + if ( channel_desc_alt .contains( channs_for_wvl[ i ] ) ) { - qDebug() << "In get_replicate_group_results(): channel_desc_alt, wvl -- " << channel_desc_alt << u_wvl; + qDebug() << "In get_replicate_group_results(): channel_desc_alt, channs_for_wvl[ i ], wvl -- " + << channel_desc_alt + << channs_for_wvl[ i ] + << u_wvl; //Select US_ReportGMP for channel in a Replicate group && representative wvl! reportGMP = ch_reports[ channel_desc_alt ][ u_wvl ]; @@ -7677,6 +7684,7 @@ QMap US_ReporterGMP::get_replicate_group_results( US_ReportGMP: break; } } + //then pick report's ReportItem corresponding to the passed ref_report_item: int report_items_number = reportGMP. reportItems.size(); for ( int kk = 0; kk < report_items_number; ++kk ) From 6cc8140ed633c1d27297ab96b1209271952d552d Mon Sep 17 00:00:00 2001 From: alexsav815 Date: Tue, 22 Oct 2024 17:47:55 -0500 Subject: [PATCH 2/5] [fix 1 for -- ] GMP : Reporting Averages over Replicates for all Optics types -- attemp to resolve, will be tested on Workshop DB for specifically created combo-run out of uploaded form disk data... --- programs/us_reporter_gmp/us_reporter_gmp.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/programs/us_reporter_gmp/us_reporter_gmp.cpp b/programs/us_reporter_gmp/us_reporter_gmp.cpp index ffa3f5376..ee91081fa 100644 --- a/programs/us_reporter_gmp/us_reporter_gmp.cpp +++ b/programs/us_reporter_gmp/us_reporter_gmp.cpp @@ -7512,6 +7512,7 @@ QString US_ReporterGMP::calc_replicates_averages( void ) { QString ch_alt_desc = chw.key(); QStringList all_wvls = chw.value(); + QString o_type = ch_alt_desc.split(":")[1]; QStringList unique_wvls; QStringList unique_channels; @@ -7528,7 +7529,7 @@ QString US_ReporterGMP::calc_replicates_averages( void ) //here, add to list FULL channel desc, e.g. "1A:Iterf.", or "1A:UV/vis." //same_wvls_chann_map[ curr_wvl ] << curr_chann; //BEFORE - same_wvls_chann_map[ curr_wvl ] << curr_chann + ":" + ch_alt_desc.split(":")[1]; //Will this work? + same_wvls_chann_map[ curr_wvl ] << curr_chann + ":" + o_type; //Will this work? } unique_wvls. removeDuplicates(); @@ -7536,9 +7537,10 @@ QString US_ReporterGMP::calc_replicates_averages( void ) QString replicate_group_number = get_replicate_group_number( ch_alt_desc ); - html_str_replicate_av += "\n" + indent( 2 ) + tr( "

Replicate Group #%1: [Channels: %2]

\n" ) + html_str_replicate_av += "\n" + indent( 2 ) + tr( "

Replicate Group #%1: [Channels: %2 (%3)]

\n" ) .arg( replicate_group_number ) - .arg( unique_channels.join(",") ); + .arg( unique_channels.join(",") ) + .arg( o_type ); //iterate over unique wvls @@ -7548,7 +7550,7 @@ QString US_ReporterGMP::calc_replicates_averages( void ) QString replicate_subgroup_triples; for ( int jj=0; jj < same_wvls_chann_map[ u_wvl ].size(); ++jj ) - replicate_subgroup_triples += same_wvls_chann_map[ u_wvl ][ jj ] + "." + u_wvl + ","; + replicate_subgroup_triples += same_wvls_chann_map[ u_wvl ][ jj ].split(":")[0] + "." + u_wvl + ","; replicate_subgroup_triples.chop(1); From b42bbe513209718e104b23a6c8e1f2f7389282c6 Mon Sep 17 00:00:00 2001 From: alexsav815 Date: Tue, 22 Oct 2024 18:23:37 -0500 Subject: [PATCH 3/5] [fix 2 plu debugs for -- ] GMP : Reporting Averages over Replicates for all Optics types -- attemp to resolve, will be tested on Workshop DB for specifically created combo-run out of uploaded form disk data... --- programs/us_reporter_gmp/us_reporter_gmp.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/us_reporter_gmp/us_reporter_gmp.cpp b/programs/us_reporter_gmp/us_reporter_gmp.cpp index ee91081fa..ae29666d8 100644 --- a/programs/us_reporter_gmp/us_reporter_gmp.cpp +++ b/programs/us_reporter_gmp/us_reporter_gmp.cpp @@ -5356,6 +5356,11 @@ bool US_ReporterGMP::modelGuidExistsForStage_ind( QString triple_n, QString mode QString c_triple_n = Array_of_tripleNames[ i ]; c_triple_n. replace(".",""); + qDebug() << "IN modelGuidExistsForStage_ind(): triple_n, c_triple_n, model -- " + << triple_n << c_triple_n << model; + qDebug() << "IN modelGuidExistsForStage_ind(): mguid, Triple_to_ModelsDescGuid[ Array_of_tripleNames[ i ] ][ model ] -- " + << mguid << Triple_to_ModelsDescGuid[ Array_of_tripleNames[ i ] ][ model ]; + if ( c_triple_n == triple_n ) { QMap< QString, QString > tmapguid = Triple_to_ModelsDescGuid[ Array_of_tripleNames[ i ] ]; From 24e7c8d470c9d64c61ff7a148f446acaeba14ea6 Mon Sep 17 00:00:00 2001 From: alexsav815 Date: Tue, 22 Oct 2024 18:34:04 -0500 Subject: [PATCH 4/5] [fix 3 plu debugs for -- ] GMP : Reporting Averages over Replicates for all Optics types -- attemp to resolve, will be tested on Workshop DB for specifically created combo-run out of uploaded form disk data... --- programs/us_reporter_gmp/us_reporter_gmp.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/us_reporter_gmp/us_reporter_gmp.cpp b/programs/us_reporter_gmp/us_reporter_gmp.cpp index ae29666d8..1a64520cd 100644 --- a/programs/us_reporter_gmp/us_reporter_gmp.cpp +++ b/programs/us_reporter_gmp/us_reporter_gmp.cpp @@ -5423,8 +5423,9 @@ void US_ReporterGMP::process_combined_plots_individual ( QString triplesname_p, qDebug() << "INDCOMBO_1: " << modelDescModified[ ii ]; qDebug() << "INDCOMBO_2: " << triplesname << stage_model; + qDebug() << "INDCOMBO_3: " << modelGuidExistsForStage_ind( triplesname, stage_model, modelDescModifiedGuid[ ii ] ); //fiter by type|model - if ( modelDescModified[ ii ].contains( triplesname ) && + if ( modelDescModified[ ii ].contains( triplesname.replace("Interference","660") ) && modelDescModified[ ii ].contains( stage_model ) && modelGuidExistsForStage_ind( triplesname, stage_model, modelDescModifiedGuid[ ii ] ) ) { From 9c0235f68ee752512d20ff33cd258aa86510c9f3 Mon Sep 17 00:00:00 2001 From: alexsav815 Date: Tue, 22 Oct 2024 18:46:16 -0500 Subject: [PATCH 5/5] [fix 4a plu debugs for -- ] GMP : Reporting Averages over Replicates for all Optics types -- attemp to resolve, will be tested on Workshop DB for specifically created combo-run out of uploaded form disk data... --- programs/us_reporter_gmp/us_reporter_gmp.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/us_reporter_gmp/us_reporter_gmp.cpp b/programs/us_reporter_gmp/us_reporter_gmp.cpp index 1a64520cd..22e293d0a 100644 --- a/programs/us_reporter_gmp/us_reporter_gmp.cpp +++ b/programs/us_reporter_gmp/us_reporter_gmp.cpp @@ -5420,12 +5420,15 @@ void US_ReporterGMP::process_combined_plots_individual ( QString triplesname_p, for ( int ii = 0; ii < modelDescModified.size(); ii++ ) { - + QString triplesname_mod = triplesname; + if ( triplesname.contains("Interference") ) + triplesname_mod = triplesname_mod.replace( "Interference" , "660"); + qDebug() << "INDCOMBO_1: " << modelDescModified[ ii ]; qDebug() << "INDCOMBO_2: " << triplesname << stage_model; - qDebug() << "INDCOMBO_3: " << modelGuidExistsForStage_ind( triplesname, stage_model, modelDescModifiedGuid[ ii ] ); + //fiter by type|model - if ( modelDescModified[ ii ].contains( triplesname.replace("Interference","660") ) && + if ( modelDescModified[ ii ].contains( triplesname_mod ) && modelDescModified[ ii ].contains( stage_model ) && modelGuidExistsForStage_ind( triplesname, stage_model, modelDescModifiedGuid[ ii ] ) ) {