Merge pull request #168 from dessn/scone_refactor_integration

Scone refactor integration
dessn · Jun 27, 2024 · c9903db · c9903db
2 parents 1bb6853 + 41487c2
commit c9903db
Show file tree

Hide file tree

Showing 6 changed files with 595 additions and 186 deletions.
diff --git a/pippin/classifiers/classifier.py b/pippin/classifiers/classifier.py
@@ -363,7 +363,7 @@ def get_num_ranseed(sim_tasks, lcfit_tasks):
                                 # deps.append(t)
                                 extra = t.get_unique_name()
 
-                                assert t.__class__ == cls, f"Model {clas_name} with class {cls} has model {model} with class {t.__class__}, they should match!"
+                                assert isinstance(t, cls), f"Model {clas_name} with class {cls} has model {model} with class {t.__class__}, they should match!"
 
                                 indexes = get_num_ranseed(sim_deps, fit_deps)
                                 for i in range(indexes):
@@ -381,8 +381,6 @@ def get_num_ranseed(sim_tasks, lcfit_tasks):
                     for i in range(indexes):
                         num = i + 1 if indexes > 1 else None
                         clas_output_dir = _get_clas_output_dir(base_output_dir, stage_number, sim_name, fit_name, clas_name, index=num)
-                        print(clas_output_dir)
-                        print(deps)
                         cc = cls(clas_name, clas_output_dir, config, deps, mode, options, index=i)
                         Task.logger.info(
                             f"Creating classification task {name} with {cc.num_jobs} jobs, for LC fit {fit_name} on simulation {sim_name} and index {i}"