From 036bbe0b02a29343e08ff6842bfc5561d8125a37 Mon Sep 17 00:00:00 2001
From: Rohan P <rprasad2400@gmail.com>
Date: Fri, 10 Jul 2026 15:55:39 -0400
Subject: [PATCH]  added fixes

---
 hallmonitor/app.py     |  8 ++++++--
 hallmonitor/hmutils.py | 21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/hallmonitor/app.py b/hallmonitor/app.py
index 4d4e21a..4743b2f 100644
--- a/hallmonitor/app.py
+++ b/hallmonitor/app.py
@@ -25,6 +25,7 @@
     datadict_has_changes,
     file_last_modified_date,
     get_args,
+    get_deviation_files,
     get_deviation_string,
     get_eeg_errors,
     get_expected_combination_rows,
@@ -112,6 +113,7 @@ def validate_data(
     joint_rows = get_joint_root_vars(dataset)
     logger.debug("Joint rows: %s", joint_rows)
     combo_rows = get_expected_combination_rows(dataset)
+    logger.debug("Combination rows: %s", combo_rows)
     combo_variables = set()
     for combo in combo_rows:
         combo_variables.update(combo.variables)
@@ -124,8 +126,6 @@ def validate_data(
         len(missing_ids),
     )
 
-    
-
     # raise errors for missing identifiers without a no-data.txt
     for id in missing_ids:
         # if appropriate option is set, skip "missing" errors when identifier is in pending-qa
@@ -326,6 +326,7 @@ def validate_data(
             no_data_file = get_no_data_file(dir_filenames, id, joint_rows,logger)
             has_no_data = True if no_data_file else False
 
+        joint_deviation_files =  get_deviation_files(dir_filenames, id, joint_rows,logger)
 
         logger.debug("has_deviation=%s, has_no_data=%s", has_deviation, has_no_data)
         if has_deviation and has_no_data:
@@ -367,10 +368,13 @@ def validate_data(
 
         misnamed_files = []
         dir_filepaths = [os.path.join(id_dir, f) for f in dir_filenames]
+        # Solution: Create all possible known deviation.txt that could be located within as long as it iis in joint/ combination and enable it
         for file_path in dir_filepaths:
             file_name = os.path.basename(file_path)
             if file_name == deviation_file:
                 continue
+            elif file_name in joint_deviation_files:
+                continue
             elif file_name == "issue.txt":
                 pending.append(
                     new_error_record(
diff --git a/hallmonitor/hmutils.py b/hallmonitor/hmutils.py
index 3966c42..60bf57e 100644
--- a/hallmonitor/hmutils.py
+++ b/hallmonitor/hmutils.py
@@ -997,6 +997,27 @@ def get_deviation_file(dir_filenames, identifier, joint_rows, logger):
                         logger.debug("Found joint deviation file %s for identifier %s", joint_deviation_file, identifier)
                         return joint_deviation_file
     return None
+
+def get_deviation_files(dir_filenames, identifier, joint_rows, logger):
+    """
+    Return a list of deviation files for the given identifier and joint rows.
+    """
+    joint_deviation_files = []
+    if not any(f.endswith("deviation.txt") for f in dir_filenames):
+        return []
+    for joint_row in joint_rows:
+            if identifier.variable in joint_row.variables:
+                logger.debug("Identifier %s is part of joint row %s", identifier, joint_row.name)
+                # check for deviation/no-data files for joint root variable
+                #joint_deviation_file = f"{joint_row.name}_deviation.txt"
+                #joint_no_data_file = f"{joint_row.name}_no-data.txt"
+                for var in joint_row.variables:
+                    joint_id = Identifier(
+                        identifier.subject, var, identifier.session, identifier.run, identifier.event
+                    )
+                    joint_deviation_file = f"{joint_id}_deviation.txt"
+                    joint_deviation_files.append(joint_deviation_file)
+    return joint_deviation_files
     
 def get_no_data_file(dir_filenames, identifier, joint_rows, logger):
     """