QPR-12259 ignore amountCcy for simmparameter productclassmultiplier and AddOnNotionalFactor and allow it to be empty

Author: mgroncki

OREAnalytics/orea/simm/simmcalculator.cpp

@@ -108,9 +108,12 @@ SimmCalculator::SimmCalculator(const ore::analytics::Crif& crif,
 
         // Make sure we have CRIF amount denominated in the result ccy
         CrifRecord newCrifRecord = cr;
-        if (resultCcy_ == "USD" && cr.hasAmountUsd()) {
+        
+        if (cr.requiresAmountUsd() && resultCcy_ == "USD" && cr.hasAmountUsd()) {
             newCrifRecord.amountResultCcy = newCrifRecord.amountUsd;
-        } else {
+        } else if(cr.requiresAmountUsd()) {
+            // ProductClassMultiplier and AddOnNotionalFactor  don't have a currency and dont need to be converted,
+            // we use the amount
             const Real fxSpot = market_->fxRate(newCrifRecord.amountCurrency + resultCcy_)->value();
             newCrifRecord.amountResultCcy = fxSpot * newCrifRecord.amount;
         }