Remove merge strings

Author: OliverRietmann

GPU/GPUTracking/Base/GPUReconstructionCPU.cxx

@@ -215,92 +215,6 @@ int32_t GPUReconstructionCPU::ExitDevice()
   return 0;
 }
 
-<<<<<<< Updated upstream
-namespace
-{
-void writeHeaderMarkdown(std::ostream& stream)
-{
-  stream << "|   |  count | name                                      |  gpu (us) |  cpu (us) | cpu/tot |  tot (us) |      GB/s |         bytes |    bytes/call |\n";
-  stream << "|---|--------|-------------------------------------------|-----------|-----------|---------|-----------|-----------|---------------|---------------|\n";
-}
-
-void writeHeaderCSV(std::ostream& stream)
-{
-  stream << "type,count,name,gpu (us),cpu (us),cpu/total,total (us),GB/s,bytes,bytes/call\n";
-}
-
-struct Row {
-  char type = ' ';
-  std::string name;
-  uint32_t count = 0;
-  double gpu_time = -1.0;
-  double cpu_time = -1.0;
-  double total_time = -1.0;
-  uint32_t memSize = 0;
-  uint32_t statNEvents;
-
-  void writeMarkdown(std::ostream& stream)
-  {
-    double scale = 1000000.0 / statNEvents;
-    stream << "| " << type << " | ";
-    if (count != 0)
-      stream << std::format("{:6} |", count);
-    else
-      stream << "       |";
-    stream << std::format(" {:42}|", name);
-    if (gpu_time != -1.0)
-      stream << std::format("{:10.0f} |", gpu_time * scale);
-    else
-      stream << "           |";
-    if (cpu_time != -1.0)
-      stream << std::format("{:10.0f} |", cpu_time * scale);
-    else
-      stream << "           |";
-    if (cpu_time != -1.0 && total_time != -1.0)
-      stream << std::format("{:8.2f} |", cpu_time / total_time);
-    else
-      stream << "         |";
-    if (total_time != -1.0)
-      stream << std::format("{:10.0f} |", total_time * scale);
-    else
-      stream << "           |";
-    if (memSize != 0 && count != 0)
-      stream << std::format("{:10.3f} |{:14} |{:14} |", memSize / gpu_time * 1e-9, memSize / statNEvents, memSize / statNEvents / count);
-    else
-      stream << "           |               |               |";
-    stream << std::endl;
-  }
-
-  void writeCSV(std::ostream& stream)
-  {
-    double scale = 1000000.0 / statNEvents;
-    stream << type << ",";
-    if (count != 0)
-      stream << count;
-    stream << "," << name << ",";
-    if (gpu_time != -1.0)
-      stream << std::format("{:.0f}", gpu_time * scale);
-    stream << ",";
-    if (cpu_time != -1.0)
-      stream << std::format("{:.0f}", cpu_time * scale);
-    stream << ",";
-    if (cpu_time != -1.0 && total_time != -1.0)
-      stream << std::format("{:.2f}", cpu_time / total_time);
-    stream << ",";
-    if (total_time != -1.0)
-      stream << std::format("{:.0f}", total_time * scale);
-    stream << ",";
-    if (memSize != 0 && count != 0)
-      stream << std::format("{:.3f},{},{}", memSize / gpu_time * 1e-9, memSize / statNEvents, memSize / statNEvents / count);
-    else
-      stream << ",,";
-    stream << std::endl;
-  }
-};
-} // namespace
-
-=======
->>>>>>> Stashed changes
 int32_t GPUReconstructionCPU::RunChains()
 {
   mMemoryScalers->temporaryFactor = 1.;