From b616fd513912fec1539afed2c8f7a9009e5f8ec9 Mon Sep 17 00:00:00 2001
From: iltommi <tommaso.vinci@polytechnique.edu>
Date: Tue, 21 Apr 2020 21:55:13 +0200
Subject: [PATCH 1/2] Update makefile

remove duplicate line
---
 makefile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/makefile b/makefile
index f0bd0ca84..5402bdf01 100755
--- a/makefile
+++ b/makefile
@@ -373,5 +373,4 @@ help:
 	@echo 'http://www.maisondelasimulation.fr/smilei'
 	@echo 'https://github.com/SmileiPIC/Smilei'
 	@echo
-	@if [ -f  scripts/compile_tools/machine/$(machine) ]; then echo "Machine comments for $(machine):"; grep '^#' scripts/compile_tools/machine/$(machine)|| echo "None"; fi
 	@if [ -f scripts/compile_tools/machine/$(machine) ]; then echo "Machine comments for $(machine):"; grep '^#' scripts/compile_tools/machine/$(machine) || echo "None"; else echo "Available machines:"; ls -1 scripts/compile_tools/machine; fi

From a28ee8cc54966d72507736dcf024700010a157ea Mon Sep 17 00:00:00 2001
From: xsgeng <37653978+xsgeng@users.noreply.github.com>
Date: Tue, 28 Apr 2020 18:50:46 +0800
Subject: [PATCH 2/2] tracked particles assignment error (#244)

---
 src/Diagnostic/DiagnosticTrack.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Diagnostic/DiagnosticTrack.cpp b/src/Diagnostic/DiagnosticTrack.cpp
index eaba1fb46..be5046f54 100755
--- a/src/Diagnostic/DiagnosticTrack.cpp
+++ b/src/Diagnostic/DiagnosticTrack.cpp
@@ -597,12 +597,11 @@ void DiagnosticTrack::setIDs( Particles &particles )
     if( has_filter ) {
         return;
     }
-    unsigned int s = particles.size(), id;
+    unsigned int s = particles.size();
     #pragma omp critical
     {
         for( unsigned int iPart=0; iPart<s; iPart++ ) {
-            id = ++latest_Id;
-            particles.id( iPart ) = id;
+            particles.id( iPart ) = ++latest_Id;
         }
     }
 }