--- a/redelacPlanExpander.py	Mon Sep 04 15:28:46 2023 +0000
+++ b/redelacPlanExpander.py	Tue May 07 11:45:15 2024 +0000
@@ -2,17 +2,17 @@
 import pandas as pd
 import numpy as np
 
-typeOfRotation = sys.argv [1]
-USMsFileName = sys.argv[2]
-Liste_plantesFileName = sys.argv[3]
-planFileName = sys.argv[4]
-maillesFileName = sys.argv[5]
-expandedPlanFileName = sys.argv[6]
-successiveFileName = sys.argv[7]
-StationsFileName = sys.argv[8]
-aclimParHorizonFileName = sys.argv[9]
-latitudeMailleDriasDFileName= sys.argv[10]
-expandedStationsFileName = sys.argv[11]
+# typeOfRotation = sys.argv [1]
+USMsFileName = sys.argv[1]
+Liste_plantesFileName = sys.argv[2]
+planFileName = sys.argv[3]
+maillesFileName = sys.argv[4]
+expandedPlanFileName = sys.argv[5]
+successiveFileName = sys.argv[6]
+StationsFileName = sys.argv[7]
+aclimParHorizonFileName = sys.argv[8]
+latitudeMailleDriasDFileName= sys.argv[9]
+expandedStationsFileName = sys.argv[10]
 
 # 1) reading the base list of USMs
 
@@ -63,6 +63,13 @@
 # a new dataFrame to host the list of USMs in expansion
 expandedDf = pd.DataFrame()
 
+# define the type of rotation according to content
+
+if USMsDf.iloc[0]['rotation'] == 'PP' :
+    typeOfRotation = 'PP'
+else :
+    typeOfRotation = 'GC'    
+
 for i, row in planDf.iterrows():
     tmpDf = USMsDf
 

--- a/redelacPlanExpander.xml	Mon Sep 04 15:28:46 2023 +0000
+++ b/redelacPlanExpander.xml	Tue May 07 11:45:15 2024 +0000
@@ -1,18 +1,14 @@
-<tool id="redelacPlanExpander" name="redelacPlanExpander" version="1.0.0">
+<tool id="redelacPlanExpander" name="redelacPlanExpander" version="1.0.2">
   <description>to expand REDELAC situations according to a plan</description>
   <requirements>
     <container type="singularity">docker://registry.forgemia.inra.fr/redelac/redelac-toolbox:latest</container>
   </requirements>
   <command detect_errors="aggressive">
     <![CDATA[
-	     python $__tool_directory__/redelacPlanExpander.py ${typeOfRotation} ${USMs} ${Liste_plantes} ${REDELACplan} ${mailles} ${USMsExp} ${SuccessionsExp} ${Stations} ${aclimParHorizon} ${latitudeMailleDrias} ${StationsExp}
+	     python $__tool_directory__/redelacPlanExpander.py ${USMs} ${Liste_plantes} ${REDELACplan} ${mailles} ${USMsExp} ${SuccessionsExp} ${Stations} ${aclimParHorizon} ${latitudeMailleDrias} ${StationsExp}
      ]]>
   </command>
   <inputs>
-    <param name="typeOfRotation" type="select" label="Select the type of rotation">
-        <option value="PP">Prairie Permanente</option>
-        <option value="GC">Grande Culture</option>
-    </param>
     <param name="REDELACplan" type="data" format="csv" label="Select a redelac spatial plan (csv)"/>
     <param name="USMs" type="data" format="csv" label="Select a USMs list template (csv)"/>
     <param name="Liste_plantes" type="data" format="csv" label="Select a Liste_plantes (csv)"/>
@@ -20,12 +16,11 @@
     <param name="mailles" type="data" format="csv" label="Select mailles files with link between DRIAS and Safran (csv)"/>
     <param name="aclimParHorizon" type="data" format="csv" label="Select a aclimParHorizon (csv)"/>
     <param name="latitudeMailleDrias" type="data" format="csv" label="Select a latitudeMailleDrias(csv)"/>
-    <param name="Tag" type="text" value="" label="Outputs tag"/>
   </inputs>
   <outputs>
-    <data format="csv" name="USMsExp" label="USMsSheetExp${Tag}"/>
-    <data format="csv" name="StationsExp" label="StationsSheetExp${Tag}"/>
-    <data format="csv" name="SuccessionsExp" label="successionsSheetExp${Tag}"/>
+    <data format="csv" name="USMsExp" label="USMsSheetExp"/>
+    <data format="csv" name="StationsExp" label="StationsSheetExp"/>
+    <data format="csv" name="SuccessionsExp" label="successionsSheetExp"/>
   </outputs>
   <tests>
   </tests>