@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/src/calculations/radiation.ts

@@ -6,12 +6,10 @@
 * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
 * Please contact DNV if you believe changes are required.
 *
-* Version:   1.0.86
-* Date/time: 10 Jul 2025 09:49:06
+* Version:   1.0.89
+* Date/time: 29 Jul 2025 17:59:11
 * Template:  templates/typescriptpws/calculations.razor.
- ***********************************************************************/
-
-
+***********************************************************************/
 
 import * as Enums from "../enums";
 import * as Entities from "../entities";
@@ -36,12 +34,17 @@ class CalculationBase {
   messages: string[] = [];
   calculationElapsedTime?: number = 0.0;
   operationId?: string = "";
+  controller?: AbortController;
+
+  constructor(controller?: AbortController) {
+    this.controller = controller;
+  }
 
   /**
    * Post JSON to URL and time the call
    */
   async postRequest(url: string, data: string): Promise<AxiosResponse> {
-    return postRequest(url, data);
+    return postRequest(url, data, this.controller);
   }
 
   /**
@@ -175,15 +178,8 @@ class DistancesAndEllipsesToRadiationLevelsCalculationRequest extends Calculatio
   /**
    * DistancesAndEllipsesToRadiationLevels calculation request class.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs - Array of flammable output configs.
-   * @param {number} flammableOutputConfigCount - Number of radiation levels.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -191,15 +187,15 @@ class DistancesAndEllipsesToRadiationLevelsCalculationRequest extends Calculatio
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 }
 
@@ -241,15 +237,7 @@ export class DistancesAndEllipsesToRadiationLevelsCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: DistancesAndEllipsesToRadiationLevelsCalculationRequestSchemaData): DistancesAndEllipsesToRadiationLevelsCalculationRequest {
-    return new DistancesAndEllipsesToRadiationLevelsCalculationRequest(
-      data.flameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount
-    );
+    return new DistancesAndEllipsesToRadiationLevelsCalculationRequest(data);
   }
 }
 
@@ -269,15 +257,8 @@ export class DistancesAndEllipsesToRadiationLevelsCalculation extends Calculatio
   /**
    * Calculates the distances and ellipses to specified radiation intensity levels from a flame model. This calculation can be called after fireball and jet fire calculation.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs - Array of flammable output configs.
-   * @param {number} flammableOutputConfigCount - Number of radiation levels.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -285,28 +266,29 @@ export class DistancesAndEllipsesToRadiationLevelsCalculation extends Calculatio
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
-    super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 
   async run() {
     try {
-      const request = new DistancesAndEllipsesToRadiationLevelsCalculationRequest(
-        this.flameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount
-      );
+      const request = new DistancesAndEllipsesToRadiationLevelsCalculationRequest({
+        flameResult: this.flameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount
+      });
 
       const schema = new DistancesAndEllipsesToRadiationLevelsCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -394,12 +376,8 @@ export class DistancesAndEllipsesToRadiationLevelsCalculationResponse extends Ca
   /**
    * DistancesAndEllipsesToRadiationLevels calculation response class.
    *
-   * @param {number[]} distances -  an array of distances to radiation levels, corresponding to the flammable output configs.
-   * @param {Entities.LocalPosition[]} contourPoints - Contour points of radiation ellipses to radiation levels.
-   * @param {number[]} nContourPoints -  an array of the number of contour points, corresponding to the flammable output configs.
-   * @param {number[]} areas -  an array of areas of the ellipses to radiation levels, corresponding to the flammable output configs.
    */
-  constructor(
+  constructor(data: {
     distances: number[],
     contourPoints: Entities.LocalPosition[],
     nContourPoints: number[],
@@ -408,16 +386,16 @@ export class DistancesAndEllipsesToRadiationLevelsCalculationResponse extends Ca
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.distances = distances;
-    this.contourPoints = contourPoints;
-    this.nContourPoints = nContourPoints;
-    this.areas = areas;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.distances = data.distances;
+    this.contourPoints = data.contourPoints;
+    this.nContourPoints = data.nContourPoints;
+    this.areas = data.areas;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -502,16 +480,7 @@ export class DistancesAndEllipsesToRadiationLevelsCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: DistancesAndEllipsesToRadiationLevelsCalculationResponseSchemaData): DistancesAndEllipsesToRadiationLevelsCalculationResponse {
-    return new DistancesAndEllipsesToRadiationLevelsCalculationResponse(
-      data.distances,
-      data.contourPoints,
-      data.nContourPoints,
-      data.areas,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new DistancesAndEllipsesToRadiationLevelsCalculationResponse(data);
   }
 }
 
@@ -537,15 +506,8 @@ class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest extend
   /**
    * DistancesAndEllipsesToRadiationLevelsForPoolFires calculation request class.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Scalar pool fire flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs.
-   * @param {number} flammableOutputConfigCount - Number of radiation levels.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -553,15 +515,15 @@ class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest extend
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
+  }) {
     super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 }
 
@@ -603,15 +565,7 @@ export class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest
   }
 
   makeCalculationRequest(data: DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequestSchemaData): DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest {
-    return new DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest(
-      data.poolFireFlameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount
-    );
+    return new DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest(data);
   }
 }
 
@@ -631,15 +585,8 @@ export class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculation extend
   /**
    * Calculates the distances and ellipses to specified radiation intensity levels from a flame model.  This calculation can be called after pool fire calculation.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Scalar pool fire flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs.
-   * @param {number} flammableOutputConfigCount - Number of radiation levels.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -647,28 +594,29 @@ export class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculation extend
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
-    super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 
   async run() {
     try {
-      const request = new DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest(
-        this.poolFireFlameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount
-      );
+      const request = new DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequest({
+        poolFireFlameResult: this.poolFireFlameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount
+      });
 
       const schema = new DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -756,12 +704,8 @@ export class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRespons
   /**
    * DistancesAndEllipsesToRadiationLevelsForPoolFires calculation response class.
    *
-   * @param {number[]} distances -  an array of distances to radiation levels, corresponding to the flammable output configs.
-   * @param {Entities.LocalPosition[]} contourPoints - Contour points of radiation ellipses to radiation levels.
-   * @param {number[]} nContourPoints -  an array of the number of contour points, corresponding to the flammable output configs.
-   * @param {number[]} areas -  an array of areas of the ellipses to radiation levels, responding to the flammable output configs.
    */
-  constructor(
+  constructor(data: {
     distances: number[],
     contourPoints: Entities.LocalPosition[],
     nContourPoints: number[],
@@ -770,16 +714,16 @@ export class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRespons
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.distances = distances;
-    this.contourPoints = contourPoints;
-    this.nContourPoints = nContourPoints;
-    this.areas = areas;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.distances = data.distances;
+    this.contourPoints = data.contourPoints;
+    this.nContourPoints = data.nContourPoints;
+    this.areas = data.areas;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -864,16 +808,7 @@ export class DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationRespons
   }
 
   makeCalculationResponse(data: DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationResponseSchemaData): DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationResponse {
-    return new DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationResponse(
-      data.distances,
-      data.contourPoints,
-      data.nContourPoints,
-      data.areas,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new DistancesAndEllipsesToRadiationLevelsForPoolFiresCalculationResponse(data);
   }
 }
 
@@ -899,15 +834,8 @@ class DistancesToRadiationLevelsCalculationRequest extends CalculationRequestBas
   /**
    * DistancesToRadiationLevels calculation request class.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs.
-   * @param {number} flammableOutputConfigCount - Number of flammable output configs.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -915,15 +843,15 @@ class DistancesToRadiationLevelsCalculationRequest extends CalculationRequestBas
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 }
 
@@ -965,15 +893,7 @@ export class DistancesToRadiationLevelsCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: DistancesToRadiationLevelsCalculationRequestSchemaData): DistancesToRadiationLevelsCalculationRequest {
-    return new DistancesToRadiationLevelsCalculationRequest(
-      data.flameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount
-    );
+    return new DistancesToRadiationLevelsCalculationRequest(data);
   }
 }
 
@@ -990,15 +910,8 @@ export class DistancesToRadiationLevelsCalculation extends CalculationBase {
   /**
    * Calculates the distances to specified radiation intensity levels from a flame model.  This calculation can be called after any type of fire calculation (fireball, jet fire, pool fire).
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  an array of flammable output configs.
-   * @param {number} flammableOutputConfigCount - Number of flammable output configs.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -1006,28 +919,29 @@ export class DistancesToRadiationLevelsCalculation extends CalculationBase {
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
-    super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 
   async run() {
     try {
-      const request = new DistancesToRadiationLevelsCalculationRequest(
-        this.flameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount
-      );
+      const request = new DistancesToRadiationLevelsCalculationRequest({
+        flameResult: this.flameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount
+      });
 
       const schema = new DistancesToRadiationLevelsCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1091,21 +1005,20 @@ export class DistancesToRadiationLevelsCalculationResponse extends CalculationRe
   /**
    * DistancesToRadiationLevels calculation response class.
    *
-   * @param {number[]} distances -  an array of distances to radiation levels, corresponding to the flammable output configs.
    */
-  constructor(
+  constructor(data: {
     distances: number[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.distances = distances;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.distances = data.distances;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1166,13 +1079,7 @@ export class DistancesToRadiationLevelsCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: DistancesToRadiationLevelsCalculationResponseSchemaData): DistancesToRadiationLevelsCalculationResponse {
-    return new DistancesToRadiationLevelsCalculationResponse(
-      data.distances,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new DistancesToRadiationLevelsCalculationResponse(data);
   }
 }
 
@@ -1196,28 +1103,22 @@ class DistanceToRadiationCalculationRequest extends CalculationRequestBase {
   /**
    * DistanceToRadiation calculation request class.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 }
 
@@ -1257,14 +1158,7 @@ export class DistanceToRadiationCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: DistanceToRadiationCalculationRequestSchemaData): DistanceToRadiationCalculationRequest {
-    return new DistanceToRadiationCalculationRequest(
-      data.flameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfig
-    );
+    return new DistanceToRadiationCalculationRequest(data);
   }
 }
 
@@ -1280,40 +1174,35 @@ export class DistanceToRadiationCalculation extends CalculationBase {
   /**
    * Calculates the distance to a specified radiation intensity or lethality level from a flame model.  This calculation an be called after any type of fire calculation (fireball, jet fire, pool fire).
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
-    super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 
   async run() {
     try {
-      const request = new DistanceToRadiationCalculationRequest(
-        this.flameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfig
-      );
+      const request = new DistanceToRadiationCalculationRequest({
+        flameResult: this.flameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfig: this.flammableOutputConfig
+      });
 
       const schema = new DistanceToRadiationCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1372,21 +1261,20 @@ export class DistanceToRadiationCalculationResponse extends CalculationResponseB
   /**
    * DistanceToRadiation calculation response class.
    *
-   * @param {number} distance - Distance to radiation level.
    */
-  constructor(
+  constructor(data: {
     distance: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.distance = distance;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.distance = data.distance;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1447,13 +1335,7 @@ export class DistanceToRadiationCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: DistanceToRadiationCalculationResponseSchemaData): DistanceToRadiationCalculationResponse {
-    return new DistanceToRadiationCalculationResponse(
-      data.distance,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new DistanceToRadiationCalculationResponse(data);
   }
 }
 
@@ -1477,28 +1359,22 @@ class RadiationAtAPointCalculationRequest extends CalculationRequestBase {
   /**
    * RadiationAtAPoint calculation request class.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity, for setting the point coordinates.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 }
 
@@ -1538,14 +1414,7 @@ export class RadiationAtAPointCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: RadiationAtAPointCalculationRequestSchemaData): RadiationAtAPointCalculationRequest {
-    return new RadiationAtAPointCalculationRequest(
-      data.flameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfig
-    );
+    return new RadiationAtAPointCalculationRequest(data);
   }
 }
 
@@ -1561,40 +1430,35 @@ export class RadiationAtAPointCalculation extends CalculationBase {
   /**
    * Calculates the radiation at coordinates x, y, z from a flammable model.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity, for setting the point coordinates.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
-    super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 
   async run() {
     try {
-      const request = new RadiationAtAPointCalculationRequest(
-        this.flameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfig
-      );
+      const request = new RadiationAtAPointCalculationRequest({
+        flameResult: this.flameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfig: this.flammableOutputConfig
+      });
 
       const schema = new RadiationAtAPointCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1653,21 +1517,20 @@ export class RadiationAtAPointCalculationResponse extends CalculationResponseBas
   /**
    * RadiationAtAPoint calculation response class.
    *
-   * @param {number} radiation - Radiation at a point.
    */
-  constructor(
+  constructor(data: {
     radiation: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.radiation = radiation;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.radiation = data.radiation;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1728,13 +1591,7 @@ export class RadiationAtAPointCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: RadiationAtAPointCalculationResponseSchemaData): RadiationAtAPointCalculationResponse {
-    return new RadiationAtAPointCalculationResponse(
-      data.radiation,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new RadiationAtAPointCalculationResponse(data);
   }
 }
 
@@ -1758,28 +1615,22 @@ class RadiationAtAPointForPoolFiresCalculationRequest extends CalculationRequest
   /**
    * RadiationAtAPointForPoolFires calculation request class.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity, for setting the point coordinates.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
+  }) {
     super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 }
 
@@ -1819,14 +1670,7 @@ export class RadiationAtAPointForPoolFiresCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: RadiationAtAPointForPoolFiresCalculationRequestSchemaData): RadiationAtAPointForPoolFiresCalculationRequest {
-    return new RadiationAtAPointForPoolFiresCalculationRequest(
-      data.poolFireFlameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfig
-    );
+    return new RadiationAtAPointForPoolFiresCalculationRequest(data);
   }
 }
 
@@ -1842,40 +1686,35 @@ export class RadiationAtAPointForPoolFiresCalculation extends CalculationBase {
   /**
    * Calculates the radiation at coordinates x, y, z from a pool fire model.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity, for setting the point coordinates.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
-    super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 
   async run() {
     try {
-      const request = new RadiationAtAPointForPoolFiresCalculationRequest(
-        this.poolFireFlameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfig
-      );
+      const request = new RadiationAtAPointForPoolFiresCalculationRequest({
+        poolFireFlameResult: this.poolFireFlameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfig: this.flammableOutputConfig
+      });
 
       const schema = new RadiationAtAPointForPoolFiresCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1934,21 +1773,20 @@ export class RadiationAtAPointForPoolFiresCalculationResponse extends Calculatio
   /**
    * RadiationAtAPointForPoolFires calculation response class.
    *
-   * @param {number} radiation - Radiation at a point.
    */
-  constructor(
+  constructor(data: {
     radiation: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.radiation = radiation;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.radiation = data.radiation;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2009,13 +1847,7 @@ export class RadiationAtAPointForPoolFiresCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: RadiationAtAPointForPoolFiresCalculationResponseSchemaData): RadiationAtAPointForPoolFiresCalculationResponse {
-    return new RadiationAtAPointForPoolFiresCalculationResponse(
-      data.radiation,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new RadiationAtAPointForPoolFiresCalculationResponse(data);
   }
 }
 
@@ -2041,15 +1873,8 @@ class RadiationAtPointsCalculationRequest extends CalculationRequestBase {
   /**
    * RadiationAtPoints calculation request class.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  a flammable output config entity, for setting the point coordinates.
-   * @param {number} flammableOutputConfigCount - Number of points.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -2057,15 +1882,15 @@ class RadiationAtPointsCalculationRequest extends CalculationRequestBase {
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 }
 
@@ -2107,15 +1932,7 @@ export class RadiationAtPointsCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: RadiationAtPointsCalculationRequestSchemaData): RadiationAtPointsCalculationRequest {
-    return new RadiationAtPointsCalculationRequest(
-      data.flameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount
-    );
+    return new RadiationAtPointsCalculationRequest(data);
   }
 }
 
@@ -2132,15 +1949,8 @@ export class RadiationAtPointsCalculation extends CalculationBase {
   /**
    * Calculates the radiation at an array of coordinates x, y, z from a flammable model.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  a flammable output config entity, for setting the point coordinates.
-   * @param {number} flammableOutputConfigCount - Number of points.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -2148,28 +1958,29 @@ export class RadiationAtPointsCalculation extends CalculationBase {
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
-    super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 
   async run() {
     try {
-      const request = new RadiationAtPointsCalculationRequest(
-        this.flameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount
-      );
+      const request = new RadiationAtPointsCalculationRequest({
+        flameResult: this.flameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount
+      });
 
       const schema = new RadiationAtPointsCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2233,21 +2044,20 @@ export class RadiationAtPointsCalculationResponse extends CalculationResponseBas
   /**
    * RadiationAtPoints calculation response class.
    *
-   * @param {number[]} radiation -  an array of radiation at a point.
    */
-  constructor(
+  constructor(data: {
     radiation: number[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.radiation = radiation;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.radiation = data.radiation;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2308,13 +2118,7 @@ export class RadiationAtPointsCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: RadiationAtPointsCalculationResponseSchemaData): RadiationAtPointsCalculationResponse {
-    return new RadiationAtPointsCalculationResponse(
-      data.radiation,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new RadiationAtPointsCalculationResponse(data);
   }
 }
 
@@ -2340,15 +2144,8 @@ class RadiationAtPointsForPoolFiresCalculationRequest extends CalculationRequest
   /**
    * RadiationAtPointsForPoolFires calculation request class.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  a flammable output config entity, for setting the point coordinates.
-   * @param {number} flammableOutputConfigCount - Number of points.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -2356,15 +2153,15 @@ class RadiationAtPointsForPoolFiresCalculationRequest extends CalculationRequest
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
+  }) {
     super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 }
 
@@ -2406,15 +2203,7 @@ export class RadiationAtPointsForPoolFiresCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: RadiationAtPointsForPoolFiresCalculationRequestSchemaData): RadiationAtPointsForPoolFiresCalculationRequest {
-    return new RadiationAtPointsForPoolFiresCalculationRequest(
-      data.poolFireFlameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfigs,
-      data.flammableOutputConfigCount
-    );
+    return new RadiationAtPointsForPoolFiresCalculationRequest(data);
   }
 }
 
@@ -2431,15 +2220,8 @@ export class RadiationAtPointsForPoolFiresCalculation extends CalculationBase {
   /**
    * Calculates the radiation at an array of coordinates x, y, z from a pool fire model.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig[]} flammableOutputConfigs -  a flammable output config entity, for setting the point coordinates.
-   * @param {number} flammableOutputConfigCount - Number of points.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
@@ -2447,28 +2229,29 @@ export class RadiationAtPointsForPoolFiresCalculation extends CalculationBase {
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfigs: Entities.FlammableOutputConfig[],
     flammableOutputConfigCount: number
-  ) {
-    super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfigs = flammableOutputConfigs;
-    this.flammableOutputConfigCount = flammableOutputConfigCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfigs = data.flammableOutputConfigs;
+    this.flammableOutputConfigCount = data.flammableOutputConfigCount;
   }
 
   async run() {
     try {
-      const request = new RadiationAtPointsForPoolFiresCalculationRequest(
-        this.poolFireFlameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfigs,
-        this.flammableOutputConfigCount
-      );
+      const request = new RadiationAtPointsForPoolFiresCalculationRequest({
+        poolFireFlameResult: this.poolFireFlameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfigs: this.flammableOutputConfigs,
+        flammableOutputConfigCount: this.flammableOutputConfigCount
+      });
 
       const schema = new RadiationAtPointsForPoolFiresCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2532,21 +2315,20 @@ export class RadiationAtPointsForPoolFiresCalculationResponse extends Calculatio
   /**
    * RadiationAtPointsForPoolFires calculation response class.
    *
-   * @param {number[]} radiation -  an array of radiation at a point.
    */
-  constructor(
+  constructor(data: {
     radiation: number[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.radiation = radiation;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.radiation = data.radiation;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2607,13 +2389,7 @@ export class RadiationAtPointsForPoolFiresCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: RadiationAtPointsForPoolFiresCalculationResponseSchemaData): RadiationAtPointsForPoolFiresCalculationResponse {
-    return new RadiationAtPointsForPoolFiresCalculationResponse(
-      data.radiation,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new RadiationAtPointsForPoolFiresCalculationResponse(data);
   }
 }
 
@@ -2637,28 +2413,22 @@ class RadiationContourCalculationRequest extends CalculationRequestBase {
   /**
    * RadiationContour calculation request class.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 }
 
@@ -2698,14 +2468,7 @@ export class RadiationContourCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: RadiationContourCalculationRequestSchemaData): RadiationContourCalculationRequest {
-    return new RadiationContourCalculationRequest(
-      data.flameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfig
-    );
+    return new RadiationContourCalculationRequest(data);
   }
 }
 
@@ -2721,40 +2484,35 @@ export class RadiationContourCalculation extends CalculationBase {
   /**
    * Calculates the radiation contours from a flame model out to a specified intensity or lethality level. This calculation an be called after any type of fire calculation (fireball, jet fire, pool fire). Sideviews and footprints can be requested.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
-    super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 
   async run() {
     try {
-      const request = new RadiationContourCalculationRequest(
-        this.flameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfig
-      );
+      const request = new RadiationContourCalculationRequest({
+        flameResult: this.flameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfig: this.flammableOutputConfig
+      });
 
       const schema = new RadiationContourCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2818,21 +2576,20 @@ export class RadiationContourCalculationResponse extends CalculationResponseBase
   /**
    * RadiationContour calculation response class.
    *
-   * @param {Entities.LocalPosition[]} contourPoints -  an array of contour points.
    */
-  constructor(
+  constructor(data: {
     contourPoints: Entities.LocalPosition[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.contourPoints = contourPoints;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.contourPoints = data.contourPoints;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2899,13 +2656,7 @@ export class RadiationContourCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: RadiationContourCalculationResponseSchemaData): RadiationContourCalculationResponse {
-    return new RadiationContourCalculationResponse(
-      data.contourPoints,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new RadiationContourCalculationResponse(data);
   }
 }
 
@@ -2929,28 +2680,22 @@ class RadiationTransectCalculationRequest extends CalculationRequestBase {
   /**
    * RadiationTransect calculation request class.
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 }
 
@@ -2990,14 +2735,7 @@ export class RadiationTransectCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: RadiationTransectCalculationRequestSchemaData): RadiationTransectCalculationRequest {
-    return new RadiationTransectCalculationRequest(
-      data.flameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfig
-    );
+    return new RadiationTransectCalculationRequest(data);
   }
 }
 
@@ -3013,40 +2751,35 @@ export class RadiationTransectCalculation extends CalculationBase {
   /**
    * Calculates the radiation along a specified transect from a flame model down to a specified intensity or lethality level. This calculation an be called after any type of fire calculation (fireball, jet fire, pool fire).
    *
-   * @param {Entities.FlameResult} flameResult - Scalar flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
-    super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 
   async run() {
     try {
-      const request = new RadiationTransectCalculationRequest(
-        this.flameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfig
-      );
+      const request = new RadiationTransectCalculationRequest({
+        flameResult: this.flameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfig: this.flammableOutputConfig
+      });
 
       const schema = new RadiationTransectCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -3110,21 +2843,20 @@ export class RadiationTransectCalculationResponse extends CalculationResponseBas
   /**
    * RadiationTransect calculation response class.
    *
-   * @param {Entities.RadiationRecord[]} radiationRecords -  an array of radiation records along transect.
    */
-  constructor(
+  constructor(data: {
     radiationRecords: Entities.RadiationRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.radiationRecords = radiationRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.radiationRecords = data.radiationRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -3191,13 +2923,7 @@ export class RadiationTransectCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: RadiationTransectCalculationResponseSchemaData): RadiationTransectCalculationResponse {
-    return new RadiationTransectCalculationResponse(
-      data.radiationRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new RadiationTransectCalculationResponse(data);
   }
 }
 
@@ -3221,28 +2947,22 @@ class RadiationTransectForPoolFiresCalculationRequest extends CalculationRequest
   /**
    * RadiationTransectForPoolFires calculation request class.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Pool fire flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
+  }) {
     super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 }
 
@@ -3282,14 +3002,7 @@ export class RadiationTransectForPoolFiresCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: RadiationTransectForPoolFiresCalculationRequestSchemaData): RadiationTransectForPoolFiresCalculationRequest {
-    return new RadiationTransectForPoolFiresCalculationRequest(
-      data.poolFireFlameResult,
-      data.flameRecords,
-      data.flameRecordCount,
-      data.weather,
-      data.flammableParameters,
-      data.flammableOutputConfig
-    );
+    return new RadiationTransectForPoolFiresCalculationRequest(data);
   }
 }
 
@@ -3305,40 +3018,35 @@ export class RadiationTransectForPoolFiresCalculation extends CalculationBase {
   /**
    * Calculates the radiation along a specified transect from a flame model down to a specified intensity or lethality level. This calculation can be called after pool fire calculation.
    *
-   * @param {Entities.PoolFireFlameResult} poolFireFlameResult - Pool fire flame results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of flame records.
-   * @param {number} flameRecordCount - Number of flame records.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
-   * @param {Entities.FlammableOutputConfig} flammableOutputConfig -  a flammable output config entity.
    */
-  constructor(
+  constructor(data: {
     poolFireFlameResult: Entities.PoolFireFlameResult,
     flameRecords: Entities.FlameRecord[],
     flameRecordCount: number,
     weather: Entities.Weather,
     flammableParameters: Entities.FlammableParameters,
     flammableOutputConfig: Entities.FlammableOutputConfig
-  ) {
-    super();
-    this.poolFireFlameResult = poolFireFlameResult;
-    this.flameRecords = flameRecords;
-    this.flameRecordCount = flameRecordCount;
-    this.weather = weather;
-    this.flammableParameters = flammableParameters;
-    this.flammableOutputConfig = flammableOutputConfig;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.poolFireFlameResult = data.poolFireFlameResult;
+    this.flameRecords = data.flameRecords;
+    this.flameRecordCount = data.flameRecordCount;
+    this.weather = data.weather;
+    this.flammableParameters = data.flammableParameters;
+    this.flammableOutputConfig = data.flammableOutputConfig;
   }
 
   async run() {
     try {
-      const request = new RadiationTransectForPoolFiresCalculationRequest(
-        this.poolFireFlameResult,
-        this.flameRecords,
-        this.flameRecordCount,
-        this.weather,
-        this.flammableParameters,
-        this.flammableOutputConfig
-      );
+      const request = new RadiationTransectForPoolFiresCalculationRequest({
+        poolFireFlameResult: this.poolFireFlameResult,
+        flameRecords: this.flameRecords,
+        flameRecordCount: this.flameRecordCount,
+        weather: this.weather,
+        flammableParameters: this.flammableParameters,
+        flammableOutputConfig: this.flammableOutputConfig
+      });
 
       const schema = new RadiationTransectForPoolFiresCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -3402,21 +3110,20 @@ export class RadiationTransectForPoolFiresCalculationResponse extends Calculatio
   /**
    * RadiationTransectForPoolFires calculation response class.
    *
-   * @param {Entities.RadiationRecord[]} radiationRecords -  an array of radiation records along transect.
    */
-  constructor(
+  constructor(data: {
     radiationRecords: Entities.RadiationRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.radiationRecords = radiationRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.radiationRecords = data.radiationRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -3483,12 +3190,6 @@ export class RadiationTransectForPoolFiresCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: RadiationTransectForPoolFiresCalculationResponseSchemaData): RadiationTransectForPoolFiresCalculationResponse {
-    return new RadiationTransectForPoolFiresCalculationResponse(
-      data.radiationRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new RadiationTransectForPoolFiresCalculationResponse(data);
   }
 }