Fix proportion correct calcualtion for showups

lmickes · Mar 23, 2023 · 16c0782 · 16c0782
1 parent d949e2f
commit 16c0782
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pyWitness/DataProcessed.py b/pyWitness/DataProcessed.py
@@ -271,14 +271,15 @@ def calculateCAC(self) :
         if self.lineupSize != 1 :                                                                           # SHOWUP
             cid = self.data_pivot.loc['targetPresent','suspectId']
         else :
-            cid = self.data_pivot.loc['targetPresent', 'suspectId'] + self.data_pivot.loc['targetPresent', 'rejectId']
-
+            #cid = self.data_pivot.loc['targetPresent', 'suspectId'] + self.data_pivot.loc['targetPresent', 'rejectId']
+            cid = self.data_pivot.loc['targetPresent', 'suspectId'] + self.data_pivot.loc['targetAbsent', 'rejectId']
         try :
             if self.lineupSize != 1 :                                                                       # SHOWUP
                 fid = self.data_pivot.loc['targetAbsent','suspectId']
             else :
-                fid = self.data_pivot.loc['targetAbsent', 'suspectId'] + self.data_pivot.loc['targetAbsent', 'rejectId']
-        except KeyError :            
+                # fid = self.data_pivot.loc['targetAbsent', 'suspectId'] + self.data_pivot.loc['targetAbsent', 'rejectId']
+                fid = self.data_pivot.loc['targetPresent', 'rejectId'] + self.data_pivot.loc['targetAbsent', 'suspectId']
+        except KeyError :
             fid = self.data_pivot.loc['targetAbsent','fillerId']/self.lineupSize
 
         cac = cid/(cid+fid)