File tree Expand file tree Collapse file tree 2 files changed +5
-0
lines changed
Expand file tree Collapse file tree 2 files changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -323,13 +323,15 @@ def _is_basin_of_dataset(ds,
323323 if mapping_is_same and bn_runid == ds_runid :
324324 # This is an ideal case. Both run identifiers match and the mapping
325325 # is identical.
326+ logger .info (f"same { bn_runid } { ds_runid } " )
326327 return True
327328
328329 elif not mapping_is_same and ds_runid .rsplit ("_" , 1 )[0 ] == bn_runid :
329330 # This is a slightly more complicated cases. If you split the
330331 # run identifiers with an underscore (dclab 0.65.0 and dcnum 0.25.11
331332 # correctly support this), then the referrer has a run identifier
332333 # that starts with that of the basin.
334+ logger .info (f"basinmap { bn_runid } { ds_runid } " )
333335 return True
334336
335337 # None of the above cases matched. This is not a basin of ds.
Original file line number Diff line number Diff line change @@ -551,6 +551,8 @@ def test_upload_condensed_dataset_to_s3_job_and_verify_intra_dataset_basin_chn(
551551 assert "userdef3" not in ds .features_innate
552552 basins = ds .basins_get_dicts ()
553553 print ("BASINS2" , basins )
554+ print ("RUNID2" , ds .get_measurement_identifier ())
555+
554556 for bn_dict in basins :
555557 if bn_dict ["name" ].count ("DCOR intra-dataset for anakin.rtdc" ):
556558 assert bn_dict ["mapping" ] == "basinmap0"
@@ -571,6 +573,7 @@ def test_upload_condensed_dataset_to_s3_job_and_verify_intra_dataset_basin_chn(
571573 assert "userdef3" not in ds .features_innate
572574 basins = ds .basins_get_dicts ()
573575 print ("BASINS3" , basins )
576+ print ("RUNID2" , ds .get_measurement_identifier ())
574577 for bn_dict in basins :
575578 if bn_dict ["name" ].count ("DCOR intra-dataset for luke.rtdc" ):
576579 assert bn_dict ["mapping" ] == "basinmap1"
You can’t perform that action at this time.
0 commit comments