Merge branch 'prepareMerge' into dev

AIRLab-POLIMI · Mar 5, 2021 · 31cb650 · 31cb650
2 parents d50999a + ed602c0
commit 31cb650
Show file tree

Hide file tree

Showing 44 changed files with 6,831 additions and 6 deletions.
diff --git a/_development/Mathematica/fixMathematicaOutput_v2.py b/_development/Mathematica/fixMathematicaOutput_v2.py
@@ -91,7 +91,7 @@ def fixMathFunctions(l):
 
 	#pi
 	l = re.sub('Pi', 'M_PI', l)  
-
+	l = re.sub('mM_PItch', 'mPitch', l) 
 
 	# we have to swap the two arguments of the ArcTan because of odd Mathematica conventions
-Original file line number
+Diff line change
@@ Expand Up / @@ -91,7 +91,7 @@ def fixMathFunctions(l): @@
     	#pi
     	l = re.sub('Pi', 'M_PI', l)
+    	l = re.sub('mM_PItch', 'mPitch', l)
     	# we have to swap the two arguments of the ArcTan because of odd Mathematica conventions
@@ Expand Down @@