From 16c078291e8380ea7b831719a0d85441f4b8eb3d Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Thu, 23 Mar 2023 09:43:44 +0000 Subject: [PATCH] Fix proportion correct calcualtion for showups --- pyWitness/DataProcessed.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pyWitness/DataProcessed.py b/pyWitness/DataProcessed.py index 7d1022d..747d809 100644 --- 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)