From 64cafd533f968fa76e72b39cc1a35e26d5796b4b Mon Sep 17 00:00:00 2001
From: Leonardo Bautista-Gomez <leobago@gmail.com>
Date: Thu, 30 Mar 2023 12:08:20 +0200
Subject: [PATCH] Fix merge

---
 DAS/simulator.py | 2 +-
 study.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DAS/simulator.py b/DAS/simulator.py
index 2e968ec..4acf3f5 100644
--- a/DAS/simulator.py
+++ b/DAS/simulator.py
@@ -241,6 +241,6 @@ class Simulator:
         progress = pd.DataFrame(progressVector)
         if self.config.saveProgress:
             self.result.addMetric("progress", progress.to_dict(orient='list'))
-        self.result.populate(self.shape, missingVector)
+        self.result.populate(self.shape, self.config, missingVector)
         return self.result
 
diff --git a/study.py b/study.py
index 74dba63..aa27a5f 100644
--- a/study.py
+++ b/study.py
@@ -36,7 +36,7 @@ def runOnce(config, shape, execID):
     sim.logger.info("Shape: %s ... Block Available: %d in %d steps" % (str(sim.shape.__dict__), result.blockAvailable, len(result.missingVector)), extra=sim.format)
 
     if config.dumpXML:
-        result.dump()
+        result.dump(execID)
 
     return result