DPL Analysis: fix bug in unassigned grouping (#6275)

aalkin · web-flow · commit d26801ce514a · 2021-06-03T16:24:39.000+02:00
diff --git a/Framework/Core/include/Framework/AnalysisTask.h b/Framework/Core/include/Framework/AnalysisTask.h
@@ -370,7 +370,6 @@ struct AnalysisDataProcessorBuilder {
       {
         ++position;
         ++mGroupingElement;
-        (changeShifts<A>(), ...);
         return *this;
       }
 
@@ -410,7 +409,12 @@ struct AnalysisDataProcessorBuilder {
           } else {
             pos = position;
           }
-          pos += shifts[index];
+          if (unassignedGroups[index] > 0) {
+            if ((idValues[index])[pos + shifts[index]] < 0) {
+              ++shifts[index];
+            }
+            pos += shifts[index];
+          }
           if constexpr (soa::is_soa_filtered_t<std::decay_t<A1>>::value) {
             auto groupedElementsTable = arrow::util::get<std::shared_ptr<arrow::Table>>(((groups[index])[pos]).value);
 

Original file line number	Diff line number	Diff line change
`@@ -370,7 +370,6 @@ struct AnalysisDataProcessorBuilder {`
`370`	`370`	`{`
`371`	`371`	`++position;`
`372`	`372`	`++mGroupingElement;`
`373`		`- (changeShifts<A>(), ...);`
`374`	`373`	`return *this;`
`375`	`374`	`}`
`376`	`375`
`@@ -410,7 +409,12 @@ struct AnalysisDataProcessorBuilder {`
`410`	`409`	`} else {`
`411`	`410`	`pos = position;`
`412`	`411`	`}`
`413`		`- pos += shifts[index];`
	`412`	`+ if (unassignedGroups[index] > 0) {`
	`413`	`+ if ((idValues[index])[pos + shifts[index]] < 0) {`
	`414`	`+ ++shifts[index];`
	`415`	`+ }`
	`416`	`+ pos += shifts[index];`
	`417`	`+ }`
`414`	`418`	`if constexpr (soa::is_soa_filtered_t<std::decay_t<A1>>::value) {`
`415`	`419`	`auto groupedElementsTable = arrow::util::get<std::shared_ptr<arrow::Table>>(((groups[index])[pos]).value);`
`416`	`420`