Fixed demand for CRAFTY countries during calibration.

src/ac/ed/lurg/country/crafty/CraftyProdManager.java

@@ -34,7 +34,8 @@ public class CraftyProdManager {
 	}
 
 	public void updateWithCraftyData(Collection<CraftyCountryAgent> craftyCountryAgents, Timestep timestep, Map<CropType, GlobalPrice> worldPrices) {
-		String rootDir = ModelConfig.CRAFTY_PRODUCTION_DIR + File.separator + timestep.getYear();
+		int currentYear = (ModelConfig.IS_CALIBRATION_RUN || !ModelConfig.CHANGE_DEMAND_YEAR) ? ModelConfig.BASE_YEAR : timestep.getYear();
+		String rootDir = ModelConfig.CRAFTY_PRODUCTION_DIR + File.separator + currentYear;
 		long startTime = System.currentTimeMillis();
 		
 		WatchForFile fileWatcher = new WatchForFile(new File(rootDir + File.separator + "done"));