@enervance/insight-cim-model 0.0.153 → 0.0.157

package/dist/converter/integral7/converter.integral7.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectDCGround = exports.createNeutralGroundReturn = exports.createDCGround = exports.getGeoCoordinates = exports.ConverterIntegral7 = void 0;
+exports.getGeoCoordinates = exports.ConverterIntegral7 = void 0;
 const tslib_1 = require("tslib");
 const fs = require("fs");
 const JSZip = require("jszip");
@@ -21,6 +21,7 @@ const SubGeographicalRegion_1 = require("../../model/core/SubGeographicalRegion.
 const Substation_1 = require("../../model/core/Substation.js");
 const Terminal_1 = require("../../model/core/Terminal.js");
 const VoltageLevel_1 = require("../../model/core/VoltageLevel.js");
+const ACDCConverter_1 = require("../../model/dc/ACDCConverter.js");
 const ACDCConverterDCTerminal_1 = require("../../model/dc/ACDCConverterDCTerminal.js");
 const CsConverter_1 = require("../../model/dc/CsConverter.js");
 const CsOperatingModeKind_1 = require("../../model/dc/CsOperatingModeKind.js");
@@ -65,7 +66,6 @@ const LimitTypeKind_1 = require("../../model/operationallimits/LimitTypeKind.js"
 const OperationalLimitDirectionKind_1 = require("../../model/operationallimits/OperationalLimitDirectionKind.js");
 const OperationalLimitSet_1 = require("../../model/operationallimits/OperationalLimitSet.js");
 const OperationalLimitType_1 = require("../../model/operationallimits/OperationalLimitType.js");
-const VoltageLimit_1 = require("../../model/operationallimits/VoltageLimit.js");
 const ControlArea_1 = require("../../model/operations/ControlArea.js");
 const Breaker_1 = require("../../model/wires/Breaker.js");
 const BusbarSection_1 = require("../../model/wires/BusbarSection.js");
@@ -86,7 +86,6 @@ const PowerTransformerEnd_1 = require("../../model/wires/PowerTransformerEnd.js"
 const RatioTapChanger_1 = require("../../model/wires/RatioTapChanger.js");
 const RatioTapChangerTable_1 = require("../../model/wires/RatioTapChangerTable.js");
 const ReactiveCapabilityCurve_1 = require("../../model/wires/ReactiveCapabilityCurve.js");
-const RegulatingControl_1 = require("../../model/wires/RegulatingControl.js");
 const RegulatingControlModeKind_1 = require("../../model/wires/RegulatingControlModeKind.js");
 const StaticVarCompensator_1 = require("../../model/wires/StaticVarCompensator.js");
 const SynchronousMachineKind_1 = require("../../model/wires/SynchronousMachineKind.js");
@@ -128,13 +127,18 @@ const INTEGRALEquivalentBranch_1 = require("../../model/extensions/amprion/equiv
 const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear.js");
 const DCConverterUnit_1 = require("../../model/extensions/integral/dc/DCConverterUnit.js");
 const DCPolarityKind_1 = require("../../model/dc/DCPolarityKind.js");
+const RotatingMachine_1 = require("../../model/wires/RotatingMachine.js");
+const SynchronousMachine_1 = require("../../model/wires/SynchronousMachine.js");
+const AsynchronousMachine_1 = require("../../model/wires/AsynchronousMachine.js");
+const ControlAreaTypeKind_1 = require("../../model/operations/ControlAreaTypeKind.js");
+const CsPpccControlKind_1 = require("../../model/dc/CsPpccControlKind.js");
+const ApparentPowerLimit_1 = require("../../model/operationallimits/ApparentPowerLimit.js");
 const executor_1 = require("./dl-convert/executor.js");
 const Diagram_1 = require("../../model/diagram/Diagram.js");
 const DiagramObject_1 = require("../../model/diagram/DiagramObject.js");
 const util_asset_model_1 = require("./util-asset.model.js");
 const cim_constants_1 = require("../../constants/cim-constants.js");
 const EVWireObject_1 = require("../../model/extensions/enervance/assets/EVWireObject.js");
-const SynchronousMachine_1 = require("../../model/wires/SynchronousMachine.js");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
@@ -289,18 +293,22 @@ class ConverterIntegral7 {
             startTime = perf_hooks.performance.now();
             /** Standort -> Substation */
             yield this.convertStandorte(cimModel, integral7Modell, subGeoRegionsI7IDs, defaultValuesConfig);
-            logExecutionTime(this.logger, startTime, `convertStandorte(${cimModel.substations.size + cimModel.lines.size})`);
+            logExecutionTime(this.logger, startTime, `convertStandorte(${integral7Modell.integralStandorte.size})`);
             startTime = perf_hooks.performance.now();
             const standortIDs = [...integral7Modell.integralStandorte.keys()];
+            /** Regelzone -> ControlArea */
+            /**if (standortIDs.length) await this.convertRegelzone(cimModel, defaultValuesConfig, standortIDs);
+             logExecutionTime(this.logger, startTime, `convertRegelzone(${cimModel.controlArea.size})`);*/
+            /** Schaltanlagen -> VoltageLevel */
             if (standortIDs.length)
                 yield this.convertSchaltanlagen(cimModel, integral7Modell, standortIDs, defaultValuesConfig);
-            logExecutionTime(this.logger, startTime, `convertSchaltanlagen(${standortIDs.length})`);
+            logExecutionTime(this.logger, startTime, `convertSchaltanlagen(${integral7Modell.integralSchaltanlagen.size})`);
             startTime = perf_hooks.performance.now();
             const schaltanlagenIDs = [...integral7Modell.integralSchaltanlagen.keys()];
             /** Schaltanlagenabschnitte -> mappen auf bereits erstelltes VoltageLevel-Objekt (Schaltanlage) */
             if (schaltanlagenIDs.length)
                 yield this.convertSchaltanlagenAbschnitte(cimModel, integral7Modell, schaltanlagenIDs);
-            logExecutionTime(this.logger, startTime, `convertSchaltanlagenAbschnitte(${schaltanlagenIDs.length})`);
+            logExecutionTime(this.logger, startTime, `convertSchaltanlagenAbschnitte(${integral7Modell.integralSchaltanlagenAbschnitte.size})`);
             /** Schaltfelder -> Bay */
             startTime = perf_hooks.performance.now();
             const schaltanlagenAbschnittIDs = [...integral7Modell.integralSchaltanlagenAbschnitte.keys()];
@@ -417,34 +425,34 @@ class ConverterIntegral7 {
                 yield this.convertAsynchronmotor(cimModel, soSfKnoten, defaultValuesConfig);
                 logExecutionTime(this.logger, startTime, `convertAsynchronmotor`);
             }
-            /** Einspeisungen -> EnergySources */
+            /** Einspeisungen -> EnergySources or EquivalentInjection or ExternalNetworkInjection */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                startTime = perf_hooks.performance.now();
-                yield this.convertEinspeisungen(cimModel, soSfKnoten, objectMappingConfig, energySourceTypeMappingConfig);
+                startTime = performance.now();
+                yield this.convertEinspeisungen(cimModel, integral7Modell.targetVoltages, soSfKnoten, objectMappingConfig);
                 logExecutionTime(this.logger, startTime, `convertEinspeisungen`);
             }
             /** Generatoren -> SynchronousMachine */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                startTime = perf_hooks.performance.now();
-                // await this.convertGeneratoren(cimModel, soSfKnoten, energyTypesConfig);
+                startTime = performance.now();
+                yield this.convertGeneratoren(cimModel, integral7Modell.targetVoltages, soSfKnoten, energyTypesConfig);
                 logExecutionTime(this.logger, startTime, `convertGeneratoren`);
             }
             /** KWBlöcke -> SynchronousMachine */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                // await this.convertKraftwerksbloecke(cimModel, soSfKnoten, energyTypesConfig);
+                yield this.convertKraftwerksbloecke(cimModel, integral7Modell.targetVoltages, soSfKnoten, energyTypesConfig);
                 logExecutionTime(this.logger, startTime, `convertKraftwerksbloecke`);
             }
             /** Ersatzquerzweige -> ExternalNetworkInjection */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                startTime = perf_hooks.performance.now();
-                yield this.convertErsatzQuerZweige(cimModel, soSfKnoten, objectMappingConfig.Ersatzquerzweig.class);
+                startTime = performance.now();
+                yield this.convertErsatzQuerZweige(cimModel, integral7Modell.targetVoltages, soSfKnoten, objectMappingConfig.Ersatzquerzweig.class);
                 logExecutionTime(this.logger, startTime, `convertErsatzQuerZweige`);
             }
             /** Randnetzeinspeisungen -> ExternalNetworkInjection */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                startTime = perf_hooks.performance.now();
-                yield this.convertBoundaryInjections(cimModel, soSfKnoten, objectMappingConfig.Randnetzeinspeisung.class);
+                startTime = performance.now();
+                yield this.convertBoundaryInjections(cimModel, integral7Modell.targetVoltages, soSfKnoten, objectMappingConfig.Randnetzeinspeisung.class);
                 logExecutionTime(this.logger, startTime, `convertBoundaryInjections`);
             }
             /**  Kompensationsdrossel -> LinearShuntCompensator */
@@ -477,16 +485,16 @@ class ConverterIntegral7 {
             /** Sonderfall mit Trafo
              * Trafos müssen zuertst konvertiert werden. */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                startTime = perf_hooks.performance.now();
-                yield this.convertStatcom(cimModel, soSfKnoten);
+                startTime = performance.now();
+                yield this.convertStatcom(cimModel, integral7Modell.targetVoltages, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertStatcom`);
             }
             /** SVC -> StaticVarCompensator */
             /** Sonderfall mit Trafo
              * Trafos müssen zuertst konvertiert werden.*/
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
-                startTime = perf_hooks.performance.now();
-                yield this.convertSVC(cimModel, soSfKnoten);
+                startTime = performance.now();
+                yield this.convertSVC(cimModel, integral7Modell.targetVoltages, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertSVC`);
             }
             /** HGÜ Knoten */
@@ -497,13 +505,13 @@ class ConverterIntegral7 {
             /** HGÜ Kopfklassisch */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                // await this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
+                yield this.convertCsConverterDC(cimModel, integral7Modell, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertCsConverterDC`);
             }
             /** netz_hguekopfvsc */
             if (knotenSoIDs.length > 0 || integral7Modell.knotenSfIDs.length > 0) {
                 startTime = perf_hooks.performance.now();
-                // await this.convertVsConverterDC(cimModel, integral7Modell, soSfKnoten);
+                yield this.convertVsConverterDC(cimModel, integral7Modell.targetVoltages, integral7Modell, soSfKnoten);
                 logExecutionTime(this.logger, startTime, `convertVsConverterDC`);
             }
             /** HGÜ-Leitungen -> (DCLine, DCLineSegment)*/
@@ -615,7 +623,7 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        //console.log(`Terminal without connection ${terminalUUID}`);
+                        this.logger.debug(`debug --- DCTerminal ${terminalUUID} hat kein angeschlossenes DCConductingEquipment`);
                     }
                 }
             }
@@ -635,7 +643,7 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        //console.log(`Terminal without connection ${terminalUUID}`);
+                        this.logger.debug(`debug --- Terminal ${terminalUUID} hat kein angeschlossenes ConductingEquipment`);
                     }
                 }
             }
@@ -655,7 +663,7 @@ class ConverterIntegral7 {
                         }
                     }
                     else {
-                        //console.log(`Terminal without connection ${terminalUUID}`);
+                        this.logger.debug(`debug --- ACDCConverterDCTerminal ${terminalUUID} hat kein angeschlossenes DCConductingEquipment`);
                     }
                 }
             }
@@ -689,19 +697,22 @@ class ConverterIntegral7 {
             }));
         });
     }
-    convertRegelzone(cimModel, defaultValuesConfig) {
+    convertRegelzone(cimModel, defaultValuesConfig, standortIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.REGELZONE)) {
-                const result = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
-                for (const i7Data of result) {
+                //const resultNg: Regelzone[] = await this.mysqlController.execQuery(getNetzQuery(I7Objects.NETZGRUPPE, 0, 0, standortIDs));
+                const resultRz = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.REGELZONE, 0, 0, []));
+                for (const i7Data of resultRz) {
                     const i7Schluessel = integral_prefix_1.REGELZONE_PRAEFIX + (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                    const ctrlarea = new ControlArea_1.ControlArea((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_RZ']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
+                    const ctrlarea = new ControlArea_1.ControlArea((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner), '_RZ']), (0, utils_2.ueberpruefeZeichenkette)(i7Data.kurzname), i7Schluessel);
+                    ctrlarea.type = ControlAreaTypeKind_1.ControlAreaTypeKind.agc;
+                    ctrlarea.netInterchange = 0;
                     cimModel.addControlArea(ctrlarea);
                     this.addIdMapping(i7Data.id, ctrlarea.mrid, integral_sql_1.Integral7TableNames.REGELZONE);
                 }
             }
             else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.REGELZONE} ist nicht vorhanden.`);
+                this.logger.debug(`debug --- Tabelle ${integral_sql_1.Integral7TableNames.REGELZONE} ist nicht vorhanden.`);
             }
         });
     }
@@ -748,6 +759,10 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const i7name = (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', (0, utils_2.ueberpruefeZeichenkette)(i7Data.ukz), '_S'], 32);
                     const substation = new AMPRIONSubstation_1.AMPRIONSubstation((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), i7name, i7Data.kurzname, i7Data.kommentar, i7Data.stationsnummer, i7Data.ukz);
+                    const i7Schluessel = integral_prefix_1.STANDORT_PRAEFIX +
+                        i7Data.ukz +
+                        integral_prefix_1.MITTIGER_PUNKT +
+                        (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     let subregion = cimModel.getSubGeographicalRegion(this.integralID2UUID.get(i7Data.subgeoregion));
                     if (!subregion) {
                         const region = (0, utils_1.createIfNotExitsGeoregionByName)(cimModel, defaultValuesConfig.GeographicalRegion.name);
@@ -893,8 +908,9 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KNOTEN_SO, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KNOTEN_SO), standortIDs));
                 for (const i7Data of result) {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
-                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const vl = new VoltageLevel_1.VoltageLevel((0, parser_utils_1.getUUID)(i7Data.guid_v, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
+                    //const rdfid = getUUID(i7Data.guid); /**This is the mrid for TopologicalNode */
+                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
                     vl.addConnectivityNode(connectivityNode);
@@ -946,8 +962,8 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KNOTEN)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KNOTEN), standortIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const dcNode = new DCNode_1.DCNode(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_DCCN'], 32, true), i7Data.kurzname);
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const dcNode = new DCNode_1.DCNode(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_DCCN'], 32, true), i7Data.kurzname);
                     cimModel.addDCNode(dcNode);
                     this.addIdMapping(i7Data.id, dcNode.mrid, integral_sql_1.Integral7TableNames.HGUE_KNOTEN);
                 }
@@ -967,7 +983,8 @@ class ConverterIntegral7 {
                     busbarSection.ipMax = i7Data.limit_ip;
                     // die Sammelschienen sind nicht aggregiert.
                     busbarSection.aggregate = false;
-                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    //const rdfid: string = getUUID(i7Data.guid); /** this is the mrid for TopologicalNode*/
+                    const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_' + i7Data.pos.toString(), '_' + rdfid.substring(0, 8), '_CN'], 32, true), i7Data.kurzname);
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
                     connectivityNode.nodeNumber = i7Data.id_psse_cape;
@@ -977,14 +994,14 @@ class ConverterIntegral7 {
                         connectivityNode.connectivityNodeContainer = voltageLevel;
                         voltageLevel.addConnectivityNode(connectivityNode);
                         // umax
-                        voltageLevel.highVoltageLimit = i7Data.umax;
+                        voltageLevel.highVoltageLimit = (0, parser_utils_1.isNumericI7)(i7Data.umax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.umax) : voltageLevel.highVoltageLimit;
                         // umin
-                        voltageLevel.lowVoltageLimit = i7Data.umin;
-                        const i7Schluessel = voltageLevel.description +
-                            integral_prefix_1.SAMMELSCHIENENABSCHNITT_PRAEFIX +
-                            (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
-                        busbarSection.description = i7Schluessel;
-                        connectivityNode.description = i7Schluessel;
+                        voltageLevel.lowVoltageLimit = (0, parser_utils_1.isNumericI7)(i7Data.umin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.umin) : voltageLevel.lowVoltageLimit;
+                        /**const i7Schluessel = voltageLevel.substation.name +
+                         SAMMELSCHIENENABSCHNITT_PRAEFIX +
+                         ueberpruefeZeichenkette(i7Data.bezeichner);
+                         busbarSection.description = i7Schluessel;
+                         connectivityNode.description = i7Schluessel;*/
                         /** Spannungsband */
                         integral7.targetVoltages.set(i7Data.id, { usoll: i7Data.usoll, umin: i7Data.umin, umax: i7Data.umax });
                         // TODO VoltageLimits?
@@ -1125,13 +1142,19 @@ class ConverterIntegral7 {
                         cimModel.addMultiplierFactor(mf);
                         load.multiplierFactorUUID = mf.getUUID();
                     }
+                    if (load.getUUID() === '7c1d4120-fdaf-4bc1-aba1-9e8e76aa7a3b') {
+                        const stop = true;
+                    }
                     /** SSH */
-                    const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
+                    const powerData = (0, utils_2.getActiveReactivePower2)(i7Data, mf);
+                    // const powerDatav2 = getActiveReactivePower2(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
-                    /** Extension */
+                    /** AMPI7 profile */
                     load.p_mf = powerData[2] ? powerData[2] : undefined;
                     load.q_mf = powerData[3] ? powerData[3] : undefined;
+                    load.cos_phi = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) : undefined;
+                    load.normallyInService = inBetrieb;
                     //TODO
                     /* conformLoad.pFixed = conformLoad.p;
                      conformLoad.qFixed = conformLoad.q; */
@@ -1149,9 +1172,8 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertEinspeisungen(cimModel, knotenSfIDs, objectMappingConfig, energySourceTypeMappingConfig) {
+    convertEinspeisungen(cimModel, targetVoltages, knotenSfIDs, objectMappingConfig, energySourceTypeMappingConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const targetConfig = objectMappingConfig.Einspeisung;
             const targetClass = objectMappingConfig.Einspeisung.class;
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.EINSPEISUNG)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.EINSPEISUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.EINSPEISUNG), knotenSfIDs));
@@ -1161,7 +1183,7 @@ class ConverterIntegral7 {
                         break;
                     }
                     case cim_class_names_1.ClassNames.ExternalNetworkInjection: {
-                        yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, result);
+                        yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, targetVoltages, result);
                         break;
                     }
                     case cim_class_names_1.ClassNames.EnergySource: {
@@ -1169,17 +1191,17 @@ class ConverterIntegral7 {
                             const filtered = result.filter(it => it.spannungsgeregelt && it.einspprio === config.prio);
                             switch (config.class) {
                                 case 'ExternalNetworkInjection': {
-                                    yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, filtered);
+                                    yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, targetVoltages, filtered);
                                     break;
                                 }
                                 case 'SynchronousMachine': {
-                                    yield this.convertEnergySourceToSynchronousMachine(cimModel, filtered);
+                                    yield this.convertEnergySourceToSynchronousMachine(cimModel, targetVoltages, filtered);
                                     break;
                                 }
                             }
                         }
                         const i7EnergySourceResults = result.filter(it => !it.spannungsgeregelt);
-                        yield this.convertEinspeisungen2EnergySource(cimModel, i7EnergySourceResults, energySourceTypeMappingConfig);
+                        yield this.convertEinspeisungen2EnergySource(cimModel, targetVoltages, i7EnergySourceResults, energySourceTypeMappingConfig);
                         const others = result.filter(it => !it.spannungsgeregelt && !it.einspprio);
                         console.log(`convertEinspeisungen nicht konvertierte Objekte ${others.length}`);
                         break;
@@ -1191,21 +1213,21 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertErsatzQuerZweige(cimModel, knotenSfIDs, targetClass) {
+    convertErsatzQuerZweige(cimModel, targetVoltages, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.ERSATZQUERZWEIG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.ClassNames.EquivalentInjection: {
-                        yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
+                        yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result);
                         break;
                     }
                     case cim_class_names_1.ClassNames.ExternalNetworkInjection: {
-                        yield this.convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, result);
+                        yield this.convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, targetVoltages, result);
                         break;
                     }
                     default: {
-                        yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, result);
+                        yield this.convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result);
                     }
                 }
             }
@@ -1214,7 +1236,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertGeneratoren(cimModel, knotenSfIDs, energyTypesConfig) {
+    convertGeneratoren(cimModel, targetVoltages, knotenSfIDs, energyTypesConfig) {
         var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Generatoren werden als GeneratingUnit und SynchronousMachine abgebildet
@@ -1224,6 +1246,7 @@ class ConverterIntegral7 {
                     const genType = this.generatorTypen.get(i7Data.nametyp);
                     const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM'], 32, true), i7Data.kurzname, i7Data.nameprimaertyp);
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+                    const cosPhi = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) : undefined;
                     const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
                     const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : undefined;
                     const mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
@@ -1234,7 +1257,9 @@ class ConverterIntegral7 {
                     const isRotatingPhaseShifter = (mf !== undefined && maxP === 0 && minP === 0) || flagCondenserOperationMode;
                     const isGenerator = (maxP > 0 || maxP === undefined);
                     const isMotor = (minP < 0 || minP === undefined);
+                    /**AMPI7 profile */
                     synchronousMachine.nameprimaertyp = i7Data.nameprimaertyp !== undefined ? i7Data.nameprimaertyp : (genType !== undefined ? genType.nameprimaertyp : undefined);
+                    synchronousMachine.cos_phi = cosPhi;
                     /** Set machine type */
                     if (isRotatingPhaseShifter && isGenerator && isMotor) {
                         synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor;
@@ -1303,16 +1328,24 @@ class ConverterIntegral7 {
                     }
                     const prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
                     synchronousMachine.referencePriority = prio;
-                    const maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
-                    const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
-                    const maxQvonPmax = (0, parser_utils_1.isNumericI7)(i7Data.qmax_von_pmax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmax_von_pmax) : undefined;
-                    const minQvonPmax = (0, parser_utils_1.isNumericI7)(i7Data.qmin_von_pmax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmin_von_pmax) : undefined;
-                    const maxQvonPmin = (0, parser_utils_1.isNumericI7)(i7Data.qmax_von_pmin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmax_von_pmin) : undefined;
-                    const minQvonPmin = (0, parser_utils_1.isNumericI7)(i7Data.qmin_von_pmin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmin_von_pmin) : undefined;
+                    let maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
+                    let minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
+                    let maxQvonPmax = (0, parser_utils_1.isNumericI7)(i7Data.qmax_von_pmax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmax_von_pmax) : undefined;
+                    let minQvonPmax = (0, parser_utils_1.isNumericI7)(i7Data.qmin_von_pmax) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmin_von_pmax) : undefined;
+                    let maxQvonPmin = (0, parser_utils_1.isNumericI7)(i7Data.qmax_von_pmin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmax_von_pmin) : undefined;
+                    let minQvonPmin = (0, parser_utils_1.isNumericI7)(i7Data.qmin_von_pmin) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qmin_von_pmin) : undefined;
+                    maxQ = maxQ ? maxQ : minQ;
+                    minQ = minQ ? minQ : maxQ;
+                    maxQvonPmax = maxQvonPmax ? maxQvonPmax : maxQvonPmin;
+                    minQvonPmax = minQvonPmax ? minQvonPmax : minQvonPmin;
+                    maxQvonPmin = maxQvonPmin ? maxQvonPmin : maxQvonPmax;
+                    minQvonPmin = minQvonPmin ? minQvonPmin : minQvonPmax;
                     synchronousMachine.maxQ = maxQ ? maxQ : maxQvonPmax;
                     synchronousMachine.minQ = minQ ? minQ : minQvonPmin;
                     const pType = (genType === null || genType === void 0 ? void 0 : genType.sr) * (genType === null || genType === void 0 ? void 0 : genType.cosphir);
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
+                    // AMP I7 Profil
+                    synchronousMachine.cos_phi = i7Data.cos_phi;
                     // SSH Profil
                     synchronousMachine.setActivePower(p * -1); //convert to load sign system
                     synchronousMachine.setReactivePower(q * -1); //convert to load sign system
@@ -1339,21 +1372,21 @@ class ConverterIntegral7 {
                     /** EQ-SC */
                     synchronousMachine.earthing = ((_a = i7Data.erdung) === null || _a === void 0 ? void 0 : _a.length) > 0 && i7Data.erdung != 'isoliert' ? true : false;
                     synchronousMachine.r = (0, parser_utils_1.isNumericI7)(i7Data.rg) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rg) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.rg) ? (0, parser_utils_1.convertToNumberI7)(genType.rg) : undefined);
-                    synchronousMachine.r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : undefined;
+                    synchronousMachine.r0 = 0;
                     synchronousMachine.r2 = 0;
-                    synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : undefined;
+                    synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0g) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0g) : undefined;
                     synchronousMachine.x2 = 0;
                     synchronousMachine.satDirectSubtransX = (0, parser_utils_1.isNumericI7)(i7Data.xd2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xd2s) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.xd2s) ? (0, parser_utils_1.convertToNumberI7)(genType.xd2s) : undefined);
                     // synchronousMachine.earthingStarPointR
                     // synchronousMachine.earthingStarPointX
-                    synchronousMachine.ikk = (0, parser_utils_1.isNumericI7)(i7Data.sk_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_min) : ((0, parser_utils_1.isNumericI7)(i7Data.sk_akt) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_akt) : ((0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk_max) : undefined));
+                    synchronousMachine.ikk = (0, parser_utils_1.isNumericI7)(i7Data.ikd) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ikd) : undefined;
                     // synchronousMachine.mu: number;
                     // synchronousMachine.satDirectSyncX: number;
                     // synchronousMachine.satDirectTransX: number;
                     // synchronousMachine.shortCircuitRotorType: ShortCircuitRotorKind;
                     // synchronousMachine.voltageRegulationRange: number;
                     /** Create ReactiveCapabilityCurves */
-                    if (minP && maxP && minQvonPmin && maxQvonPmax) {
+                    if (minP !== undefined && maxP !== undefined && minQvonPmin != undefined && maxQvonPmax !== undefined) {
                         const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve((0, parser_utils_1.getUUID)(i7Data.guid_rcc, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)(['CurveData', synchronousMachine.mrid, '_RCC']));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
@@ -1376,26 +1409,6 @@ class ConverterIntegral7 {
                         cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
                         synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
                     }
-                    /** RegulatingControl */
-                    let regulatingControl = undefined;
-                    // TODO targetDeadband: ab welcher spannung soll reguliert werden.
-                    switch (i7Data.spannungsgeregelt) {
-                        case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl((0, parser_utils_1.getUUID)(i7Data.guid_rc, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)(['GEN'], 32, true));
-                            regulatingControl.targetValue = usoll !== undefined ? usoll : synchronousMachine.ratedU;
-                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                            regulatingControl.discrete = false;
-                            regulatingControl.enabled = true;
-                            synchronousMachine.controlEnabled = true;
-                            regulatingControl.addRegulatingCondEq(synchronousMachine);
-                            synchronousMachine.regulatingControlUUID = regulatingControl.getUUID();
-                            cimModel.addRegulatingControl(regulatingControl);
-                            break;
-                        }
-                        default: {
-                            synchronousMachine.controlEnabled = false;
-                        }
-                    }
                     /** GeneratingUnit section*/
                     let generatingUnit;
                     if (synchronousMachine.type !== SynchronousMachineKind_1.SynchronousMachineKind.condenser) {
@@ -1486,7 +1499,7 @@ class ConverterIntegral7 {
                         generatingUnit.addRotatingMachine(synchronousMachine);
                         synchronousMachine.generatingUnitUUID = generatingUnit.mrid;
                     }
-                    this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, regulatingControl, generatingUnit);
+                    this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, targetVoltages, generatingUnit);
                     const smtcr = new SynchronousMachineTimeConstantReactance_1.SynchronousMachineTimeConstantReactance(common_utils_1.CommonUtils.generateUUID(), `smtcr_${synchronousMachine.name}`);
                     smtcr.enabled = inBetrieb;
                     // TODO: default value?
@@ -1530,12 +1543,9 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertEnergySourceToSynchronousMachine(cimModel, result) {
+    convertEnergySourceToSynchronousMachine(cimModel, targetVoltages, result) {
         for (const i7Data of result) {
             try {
-                if (i7Data.guid.toLowerCase().includes('_e11f3fe9-0b7a-4ff1-a0dc-214c4c3fd8cc')) {
-                    console.log();
-                }
                 const synchronousMachine = new SynchronousMachine_1.SynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM'], 32, true), i7Data.kurzname);
                 const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                 const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
@@ -1558,28 +1568,7 @@ class ConverterIntegral7 {
                 const usoll = +i7Data.usoll;
                 synchronousMachine.ratedU = usoll;
                 synchronousMachine.aggregate = true;
-                /** RegulatingControl */
-                let regulatingControl = undefined;
-                // TODO targetDeadband: ab welcher spannung soll reguliert werden.
-                switch (i7Data.spannungsgeregelt) {
-                    case 1: {
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)(['GEN'], 32, true));
-                        regulatingControl.targetValue = usoll !== undefined ? usoll : synchronousMachine.ratedU;
-                        regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                        regulatingControl.discrete = false;
-                        regulatingControl.enabled = true;
-                        synchronousMachine.controlEnabled = true;
-                        regulatingControl.addRegulatingCondEq(synchronousMachine);
-                        synchronousMachine.regulatingControlUUID = regulatingControl.getUUID();
-                        synchronousMachine.regulatingControl = regulatingControl;
-                        cimModel.addRegulatingControl(regulatingControl);
-                        break;
-                    }
-                    default: {
-                        synchronousMachine.controlEnabled = false;
-                    }
-                }
-                this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, regulatingControl);
+                this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, targetVoltages);
                 cimModel.addSynchronousMachine(synchronousMachine);
                 this.addIdMapping(i7Data.id, synchronousMachine.mrid, integral_sql_1.Integral7TableNames.GENERATOR);
             }
@@ -1595,41 +1584,48 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getNetzQuery)(integral_sql_1.I7Objects.ASYNCHRONMOTOR, 0, 0, knotenSfIDs));
                 for (const i7Data of result) {
                     const assetType = this.asynchronmotorTypen.get(i7Data.nametyp);
-                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_AM']), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
+                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : true;
+                    const sr = (0, parser_utils_1.isNumericI7)(i7Data.sr) ? i7Data.sr : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.sr) ? assetType === null || assetType === void 0 ? void 0 : assetType.sr : undefined);
+                    const wirkungsgrad = (0, parser_utils_1.isNumericI7)(i7Data.wirkungsgrad) ? i7Data.wirkungsgrad : undefined;
+                    const cosphir = (0, parser_utils_1.isNumericI7)(i7Data.cosphir) ? i7Data.cosphir : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.cosphir) ? assetType === null || assetType === void 0 ? void 0 : assetType.cosphir : undefined);
+                    //AMPI7 profile content
+                    const asynchronousMachine = new INTEGRALAsynchronousMachine_1.INTEGRALAsynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_AM']), i7Data.kurzname, 'SO-' + i7Data.ukz + integral_prefix_1.MITTIGER_PUNKT + i7Data.bezeichner);
                     let mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
                         cimModel.addMultiplierFactor(mf);
                         asynchronousMachine.multiplierFactorUUID = mf.getUUID();
                     }
-                    asynchronousMachine.asynchronousMachineType = AsynchronousMachineKind_1.AsynchronousMachineKind.motor;
-                    asynchronousMachine.efficiency = i7Data.wirkungsgrad * 100;
-                    asynchronousMachine.iaIrRatio = (0, parser_utils_1.isNumericI7)(i7Data.ilr_ir) ? i7Data.ilr_ir : assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir;
-                    //asynchronousMachine.rxLockedRotorRatio = 0;
-                    asynchronousMachine.polePairNumber = (0, parser_utils_1.isNumericI7)(i7Data.polpaarz) ? i7Data.polpaarz : assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz;
-                    asynchronousMachine.ratedMechanicalPower = (0, parser_utils_1.isNumericI7)(i7Data.p_mech) ? i7Data.p_mech : assetType === null || assetType === void 0 ? void 0 : assetType.p_mech;
-                    asynchronousMachine.ratedPowerFactor = (0, parser_utils_1.isNumericI7)(i7Data.cos_phir) ? i7Data.cos_phir : assetType === null || assetType === void 0 ? void 0 : assetType.cosphir;
+                    asynchronousMachine.normallyInService = inBetrieb;
+                    //EQ core profile content
+                    asynchronousMachine.ratedPowerFactor = cosphir;
                     asynchronousMachine.ratedS = (0, parser_utils_1.isNumericI7)(i7Data.sr) ? i7Data.sr : assetType === null || assetType === void 0 ? void 0 : assetType.sr;
                     asynchronousMachine.ratedU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? i7Data.ur : assetType === null || assetType === void 0 ? void 0 : assetType.ur;
+                    //EQ short circuit profile content
+                    asynchronousMachine.converterFedDrive = false;
+                    asynchronousMachine.efficiency = wirkungsgrad * 100;
+                    asynchronousMachine.iaIrRatio = (0, parser_utils_1.isNumericI7)(i7Data.ilr_ir) ? i7Data.ilr_ir : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.ilr_ir) ? assetType.ilr_ir : undefined);
+                    asynchronousMachine.polePairNumber = (0, parser_utils_1.isNumericI7)(i7Data.polpaarz) ? i7Data.polpaarz : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.polpaarz) ? assetType.polpaarz : undefined);
+                    asynchronousMachine.ratedMechanicalPower = (0, parser_utils_1.isNumericI7)(i7Data.p_mech) ? i7Data.p_mech : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.p_mech) ? i7Data.p_mech : (0, utils_2.getPMech)(sr, wirkungsgrad, cosphir));
+                    asynchronousMachine.reversible = false;
+                    //SSH profile content
                     const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
                     asynchronousMachine.setActivePower(p);
                     asynchronousMachine.setReactivePower(q);
+                    asynchronousMachine.asynchronousMachineType = AsynchronousMachineKind_1.AsynchronousMachineKind.motor;
+                    asynchronousMachine.controlEnabled = false;
+                    //AMPI7 profile content
                     asynchronousMachine.p_mf = powerData[2] ? powerData[2] : undefined;
                     asynchronousMachine.q_mf = powerData[3] ? powerData[3] : undefined;
-                    asynchronousMachine.controlEnabled = false;
-                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : true;
-                    asynchronousMachine.normallyInService = inBetrieb;
+                    //EQ core profile content
                     const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     if (connectivityNode) {
                         (0, util_create_1.createConnection)(cimModel, asynchronousMachine, connectivityNode, PhaseCode_1.PhaseCode.ABC);
-                        //const equipmentContainer = determineEquipmentContainer('VoltageLevel', this.cimModel, this.cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()) as EquipmentContainer);
                         const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject(connectivityNode.getConnectivityNodeContainerUUID()));
                         if (equipmentContainer) {
                             equipmentContainer.addEquipment(asynchronousMachine);
                             asynchronousMachine.equipmentContainer = equipmentContainer;
-                            cimModel.addAsynchronousMachine(asynchronousMachine);
-                            this.addIdMapping(i7Data.id, asynchronousMachine.mrid, integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR);
                         }
                         else {
                             this.logger.debug(`AsynchronousMachine ${i7Data.id} besitzt keinen EquipmentContainer.`);
@@ -1638,6 +1634,8 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`AsynchronousMachine ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
+                    cimModel.addAsynchronousMachine(asynchronousMachine);
+                    this.addIdMapping(i7Data.id, asynchronousMachine.mrid, integral_sql_1.Integral7TableNames.ASYNCHRONMOTOR);
                 }
             }
             else {
@@ -1645,7 +1643,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertKraftwerksbloecke(cimModel, knotenSfIDs, energyTypesConfig) {
+    convertKraftwerksbloecke(cimModel, targetVoltages, knotenSfIDs, energyTypesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Generatoren werden als GeneratingUnit und SynchronousMachine abgebildet
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KWBLOCK)) {
@@ -1702,19 +1700,6 @@ class ConverterIntegral7 {
                     // synchronousMachine.x0 = i7Data.x0k;
                     // synchronousMachine.x2 = 0;
                     // synchronousMachine.satDirectSubtransX = i7Data.xd2s;
-                    // RegulatingControl
-                    const regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), `RC_KWBlock ${i7Data.id}`);
-                    switch (i7Data.spannungsgeregelt) {
-                        // TODO Welche Modi sind möglich?
-                        case 1: {
-                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                            break;
-                        }
-                        default: {
-                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.timeScheduled;
-                        }
-                    }
-                    synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
                     // GeneratingUnit
                     const generatingUnitConfig = energyTypesConfig[i7Data.nameprimaertyp];
                     /** Wenn ein Config für den Primärenergietyp vorhanden*/
@@ -1785,8 +1770,18 @@ class ConverterIntegral7 {
                     // generatingUnit.totalEfficiency
                     generatingUnit.addRotatingMachine(synchronousMachine);
                     synchronousMachine.generatingUnitUUID = generatingUnit.mrid;
-                    this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, regulatingControl, generatingUnit);
-                    cimModel.addRegulatingControl(regulatingControl);
+                    const regulatingControl = this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data, targetVoltages, generatingUnit);
+                    switch (i7Data.spannungsgeregelt) {
+                        // TODO Welche Modi sind möglich?
+                        case 1: {
+                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+                            break;
+                        }
+                        default: {
+                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.timeScheduled;
+                        }
+                    }
+                    synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
                     cimModel.addGeneratingUnit(generatingUnit);
                     cimModel.addSynchronousMachine(synchronousMachine);
                     this.addIdMapping(i7Data.id, synchronousMachine.mrid, integral_sql_1.Integral7TableNames.KWBLOCK);
@@ -1794,7 +1789,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, result) {
+    convertErsatzQuerZweige2ExternalNetworkInjection(cimModel, targetVoltages, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ENI']), i7Data.kurzname);
@@ -1822,14 +1817,14 @@ class ConverterIntegral7 {
                 externalNetworkInjection.minZ0ToZ1Ratio
                 externalNetworkInjection.p
                 externalNetworkInjection.q*/
-                this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data);
+                this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, targetVoltages);
                 // ToDo PSRType
                 cimModel.addExternalNetworkInjection(externalNetworkInjection);
                 this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG);
             }
         });
     }
-    convertErsatzQuerZweige2EquivalentInjection(cimModel, result) {
+    convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 const einspeisePrio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : 1;
@@ -1842,10 +1837,10 @@ class ConverterIntegral7 {
                 const p_ein = (0, parser_utils_1.isNumericI7)(i7Data.p_ein) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
                 const q_ein = (0, parser_utils_1.isNumericI7)(i7Data.q_ein) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_ein) * -1 : undefined; //Einspeisung: Erzeugerzählpfeilsystem, d.h. eine Übersetzung ins Verbraucherzählpfeilsystem wird durchgeführt
                 const kr = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
+                const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : undefined;
                 const r1 = (0, parser_utils_1.isNumericI7)(i7Data.r1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
-                const x0 = (0, parser_utils_1.isNumericI7)(i7Data.r1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
-                const x1 = (0, parser_utils_1.isNumericI7)(i7Data.r1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r1) : undefined;
+                const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : undefined;
+                const x1 = (0, parser_utils_1.isNumericI7)(i7Data.x1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x1) : undefined;
                 const equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EI']), i7Data.kurzname);
                 /** Export Extended Ward equivalent with voltage regulation */
                 if (flag_lfl && !flag_ks && usoll && (r_ext !== 0 || x_ext !== 0)) {
@@ -1862,6 +1857,19 @@ class ConverterIntegral7 {
                     equivalentInjection.x0 = 1e9;
                     equivalentInjection.x2 = 1e9;
                 }
+                /** Export Extended Ward equivalent with no voltage regulation */
+                else if ((r_ext !== 0 || x_ext !== 0)) {
+                    equivalentInjection.regulationCapability = false;
+                    equivalentInjection.rExt = r_ext;
+                    equivalentInjection.r = 1e9;
+                    equivalentInjection.r0 = 1e9;
+                    equivalentInjection.r2 = 1e9;
+                    equivalentInjection.xExt = x_ext;
+                    equivalentInjection.x = 1e9;
+                    equivalentInjection.x0 = 1e9;
+                    equivalentInjection.x2 = 1e9;
+                }
+                /** Export equivalent with only short circuit computation capability */
                 else if (!flag_lfl && flag_ks) {
                     equivalentInjection.regulationCapability = false;
                     equivalentInjection.r = r1;
@@ -1882,17 +1890,6 @@ class ConverterIntegral7 {
                     equivalentInjection.x0 = x0;
                     equivalentInjection.x2 = x1;
                 }
-                else if ((r_ext !== 0 || x_ext !== 0)) {
-                    equivalentInjection.regulationCapability = false;
-                    equivalentInjection.rExt = r_ext;
-                    equivalentInjection.r = 1e9;
-                    equivalentInjection.r0 = 1e9;
-                    equivalentInjection.r2 = 1e9;
-                    equivalentInjection.xExt = x_ext;
-                    equivalentInjection.x = 1e9;
-                    equivalentInjection.x0 = 1e9;
-                    equivalentInjection.x2 = 1e9;
-                }
                 else {
                     equivalentInjection.regulationCapability = false;
                     equivalentInjection.r = 1e9;
@@ -1908,30 +1905,30 @@ class ConverterIntegral7 {
                 equivalentInjection.einspeisePrio = einspeisePrio;
                 equivalentInjection.kr = kr;
                 equivalentInjection.aggregate = true; // default Wert im I7 Export. Not needed for EquivalentInjection, BusbarSection, PowerTransformerEnd, EquivalentShunt, EquivalentBranch
-                this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
+                this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data, targetVoltages);
                 // ToDo PSRType
                 cimModel.addEquivalentInjection(equivalentInjection);
                 this.addIdMapping(i7Data.id, equivalentInjection.mrid, integral_sql_1.Integral7TableNames.ERSATZQUERZWEIG);
             }
         });
     }
-    //TODO: Die Randnetzeinspeisung ist nach CGMES 2.4.15 eine equivalentInejction, d.h. die Fallunterscheidung kann ausbleiben?...Diskussion mit Andreas
-    convertBoundaryInjections(cimModel, knotenSfIDs, targetClass) {
+    //TODO: Die Randnetzeinspeisung ist nach CGMES 2.4.15 eine equivalentInjection, d.h. die Fallunterscheidung kann ausbleiben?...Diskussion mit Andreas
+    convertBoundaryInjections(cimModel, targetVoltages, knotenSfIDs, targetClass) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BOUNDARYINJECTION, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BOUNDARYINJECTION), knotenSfIDs));
                 switch (targetClass) {
                     case cim_class_names_1.ClassNames.EquivalentInjection: {
-                        yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
+                        yield this.convertBoundaryInjections2EquivalentInjection(cimModel, targetVoltages, result);
                         break;
                     }
                     case cim_class_names_1.ClassNames.ExternalNetworkInjection: {
-                        yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, result);
+                        yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, targetVoltages, result);
                         break;
                     }
                     default: {
                         //BoundaryInjections are always exported to EquivalentInjection objects for Boundary profile
-                        yield this.convertBoundaryInjections2EquivalentInjection(cimModel, result);
+                        yield this.convertBoundaryInjections2EquivalentInjection(cimModel, targetVoltages, result);
                     }
                 }
             }
@@ -1940,7 +1937,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertBoundaryInjections2EquivalentInjection(cimModel, result) {
+    convertBoundaryInjections2EquivalentInjection(cimModel, targetVoltages, result) {
         for (const i7Data of result) {
             const equivalentInjection = new EquivalentInjection_1.EquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), 'BD_EI']), i7Data.kurzname);
             const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
@@ -1967,7 +1964,7 @@ class ConverterIntegral7 {
             /** Spannung in kilo*/
             // regulatingControl.targetValueUnitMultiplier = UnitMultiplier.k;
             // equivalentInjection.regulatingControl = regulatingControl;
-            this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data);
+            this.setTopologyEnergySourceConsumerObject(cimModel, equivalentInjection, i7Data, targetVoltages);
             // const connectivityNode = this.cimModelDefaultValues.objects.get(this.integralID2UUID.get(i7Data.anschluss)) as IConnectivityNode;
             /** aus dem EqContainer die Sollspannung bestimmen */
             // ToDo PSRType
@@ -1992,7 +1989,7 @@ class ConverterIntegral7 {
             this.addIdMapping(i7Data.id, equivalentInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
         }
     }
-    convertBoundaryInjections2ExternalNetworkInjection(cimModel, result) {
+    convertBoundaryInjections2ExternalNetworkInjection(cimModel, targetVoltages, result) {
         for (const i7Data of result) {
             const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, utils_2.getName)(i7Data), i7Data.kurzname);
             const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
@@ -2008,18 +2005,7 @@ class ConverterIntegral7 {
             /**        externalNetworkInjection.maxR0ToX0Ratio = 1/(/x0/r0)
              externalNetworkInjection.maxR1ToX1Ratio = (1/x1/r1) */
             externalNetworkInjection.maxZ0ToZ1Ratio = (0, parser_utils_1.convertToNumberI7)(i7Data.z0_z1);
-            /** RegulatingControl */
-            const regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), `RC_BI_${i7Data.id}`);
-            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-            regulatingControl.discrete = true;
-            regulatingControl.enabled = inBetrieb;
-            /** zulässges Spannungsband um die Knoten-Sollspannung
-             * Diff umin, umax */
-            //regulatingControl.targetDeadband = i7Data.uband;
-            /** Spannung in kilo*/
-            regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
-            externalNetworkInjection.regulatingControl = regulatingControl;
-            this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
+            this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, targetVoltages);
             // const connectivityNode = this.cimModelDefaultValues.objects.get(this.integralID2UUID.get(i7Data.anschluss)) as IConnectivityNode;
             /** aus dem EqContainer die Sollspannung bestimmen */
             // ToDo PSRType
@@ -2040,7 +2026,6 @@ class ConverterIntegral7 {
                     }*/
             // ToDo PSRType
             cimModel.addExternalNetworkInjection(externalNetworkInjection);
-            cimModel.addRegulatingControl(regulatingControl);
             this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.Integral7TableNames.BOUNDARYINJECTION);
         }
     }
@@ -2079,26 +2064,31 @@ class ConverterIntegral7 {
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     this.createBoundaryConnection(frame, equivalentBranch, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     /**EQ */
-                    if (flag_lfl || (flag_lfl && flag_ks)) {
+                    if (flag_lfl && !flag_ks) {
                         equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
                         equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
-                        equivalentBranch.r21 = (0, parser_utils_1.isNumericI7)(i7Data.r21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r21_lfl) : equivalentBranch.r;
-                        equivalentBranch.x21 = (0, parser_utils_1.isNumericI7)(i7Data.x21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x21_lfl) : equivalentBranch.x;
-                        equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
+                        /*equivalentBranch.r21 = isNumericI7(i7Data.r21_lfl) ? convertToNumberI7(i7Data.r21_lfl) : equivalentBranch.r;
+                        equivalentBranch.x21 = isNumericI7(i7Data.x21_lfl) ? convertToNumberI7(i7Data.x21_lfl) : equivalentBranch.x;
+              
+                        equivalentBranch.positiveR12 = isNumericI7(i7Data.r12_ks) ? convertToNumberI7(i7Data.r12_ks) : 10e9;
                         equivalentBranch.positiveR21 = equivalentBranch.positiveR12;
-                        equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_ks) : 10e9;
+                        equivalentBranch.positiveX12 = isNumericI7(i7Data.x12_ks) ? convertToNumberI7(i7Data.x12_ks) : 10e9;
                         equivalentBranch.positiveX21 = equivalentBranch.positiveX12;
+              
                         equivalentBranch.negativeR12 = equivalentBranch.positiveR12;
                         equivalentBranch.negativeR21 = equivalentBranch.positiveR21;
                         equivalentBranch.negativeX12 = equivalentBranch.positiveX12;
                         equivalentBranch.negativeX21 = equivalentBranch.positiveX21;
-                        equivalentBranch.zeroR12 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r0) : 10e9;
+              
+                        equivalentBranch.zeroR12 = isNumericI7(i7Data.r0) ? convertToNumberI7(i7Data.r0) : 10e9;
                         equivalentBranch.zeroR21 = equivalentBranch.zeroR12;
-                        equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
-                        equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
+                        equivalentBranch.zeroX12 = isNumericI7(i7Data.x0) ? convertToNumberI7(i7Data.x0) : 10e9
+                        equivalentBranch.zeroX21 = equivalentBranch.zeroX12;*/
                     }
                     else if (!flag_lfl && flag_ks) {
                         /**EQ-SC */
+                        equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
+                        equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
                         equivalentBranch.positiveR12 = (0, parser_utils_1.isNumericI7)(i7Data.r12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_ks) : 10e9;
                         equivalentBranch.positiveR21 = equivalentBranch.positiveR12;
                         equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_ks) : 10e9;
@@ -2112,7 +2102,7 @@ class ConverterIntegral7 {
                         equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
                         equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
                     }
-                    else { //If neither flag_lfl nor flag_ks are specified, any impedance value that is specified will be exported.
+                    else { //If flag_lfl and flag_ks are specified or neither flag_lfl nor flag_ks are specified, any impedance value that is specified will be exported.
                         equivalentBranch.r = (0, parser_utils_1.isNumericI7)(i7Data.r12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r12_lfl) : 0;
                         equivalentBranch.x = (0, parser_utils_1.isNumericI7)(i7Data.x12_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x12_lfl) : 0;
                         equivalentBranch.r21 = (0, parser_utils_1.isNumericI7)(i7Data.r21_lfl) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r21_lfl) : equivalentBranch.r;
@@ -2129,7 +2119,9 @@ class ConverterIntegral7 {
                         equivalentBranch.zeroR21 = equivalentBranch.zeroR12;
                         equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
                         equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
-                        this.logger.warn(`Ersatzlängszweig mit GUID ${equivalentBranch.getUUID()} sind die Flags flag_lfl sowie flag_ks nicht definiert.`);
+                        if (!flag_lfl && !flag_ks) {
+                            this.logger.warn(`Ersatzlängszweig mit GUID ${equivalentBranch.getUUID()} sind die Flags flag_lfl sowie flag_ks nicht definiert.`);
+                        }
                     }
                     const bdf = [];
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten)));
@@ -2159,7 +2151,6 @@ class ConverterIntegral7 {
     }
     /** Kompensationsdrossel*/
     convertKompensationsdrossel(cimModel, targetVoltages, knotenSfIDs) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KOMPENSATIONSDROSSEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL), knotenSfIDs));
@@ -2216,60 +2207,13 @@ class ConverterIntegral7 {
                     }
                     shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr * -1, shunt.nomU, shunt.maximumSections);
                     shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
-                    // RegulatingControl
-                    const spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7Data.flag_lf) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lf) : false;
-                    const spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7Data.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.rpv_geregelt) : (cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg)) !== undefined ? true : false);
-                    let knotenSpgGeregelt = undefined;
-                    if (spannungsregelungRemote) {
-                        knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg));
-                    }
-                    let regulatingControl = undefined;
-                    if (spannungsregelungLokal || spannungsregelungRemote) {
-                        //Create and define regulating control for voltage control
-                        regulatingControl = new RegulatingControl_1.RegulatingControl((0, parser_utils_1.getUUID)(i7Data.guid_rc, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([shunt.getUUID().substring(0, 8), '_LSC']));
-                        regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                        regulatingControl.discrete = true; //default für ShuntCompensator ist true. s. CGMES Doku
-                        regulatingControl.targetDeadband = (0, parser_utils_1.isNumericI7)(i7Data.uband) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uband) : undefined; //zulässiges Spannungsband
-                        /** Spannung in kilo*/
-                        regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
-                        regulatingControl.enabled = true;
-                        if (knotenSpgGeregelt) {
-                            const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                            const terminal = (0, util_graph2tree_1.getControlledNode)(cn_point, knotenSpgGeregelt);
-                            if (terminal) {
-                                const cn = terminal.getConnectivityNode();
-                                if (regulatingControl.targetDeadband === undefined) {
-                                    regulatingControl.targetDeadband = cn.getBaseVoltageAsNumber() * 0.1;
-                                }
-                                regulatingControl.terminalUUID = terminal.getUUID();
-                                regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
-                                const tV = targetVoltages.get(this.UUID2Integral7ID.get(cn.getUUID()).find(elem => elem));
-                                if (tV && regulatingControl.targetValue === undefined) {
-                                    regulatingControl.targetValue = tV['usoll'];
-                                }
-                                regulatingControl.targetValue = targetVoltages.get((_b = this.UUID2Integral7ID.get(cn.getUUID())) === null || _b === void 0 ? void 0 : _b.find(elem => elem))['usoll'];
-                            }
-                        }
-                        regulatingControl.addRegulatingCondEq(shunt);
-                        shunt.regulatingControlUUID = regulatingControl.mrid;
-                        shunt.controlEnabled = regulatingControl === undefined ? false : regulatingControl.enabled;
-                        shunt.regulatingControl = regulatingControl;
-                        cimModel.addRegulatingControl(regulatingControl);
-                        const term = cimModel.terminals.get(regulatingControl.terminalUUID);
-                        if (term) {
-                            term.addRegulatingControl(regulatingControl);
-                        }
-                        else {
-                            let stop = true;
-                        }
-                    }
                     //SHC section
                     const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? i7Data.r0 : undefined;
                     const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? i7Data.x0 : undefined;
                     shunt.b0PerSection = (0, utils_2.calculateB0PerSection)(/*r0,*/ Math.abs(x0)) * -1;
                     shunt.g0PerSection = (0, utils_2.calculateG0PerSection)(r0 /*,x0*/);
                     this.setShuntGrounding(shunt, sternpunktKnotenMap.get(i7Data.knoten1p), r0, x0);
-                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, shunt.regulatingControl, undefined, targetVoltages);
+                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, targetVoltages);
                     cimModel.addLinearShuntCompensator(shunt);
                     this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
                 }
@@ -2281,7 +2225,6 @@ class ConverterIntegral7 {
     }
     /** Kompensationskondensator*/
     convertKompensationskondensatoren(cimModel, targetVoltages, knotenSfIDs) {
-        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.KOMPENSATIONSKONDENSATOR, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR), knotenSfIDs));
@@ -2338,60 +2281,13 @@ class ConverterIntegral7 {
                     }
                     shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr, shunt.nomU, shunt.maximumSections);
                     shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
-                    // RegulatingControl
-                    const spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7Data.flag_lf) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lf) : false;
-                    const spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7Data.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.rpv_geregelt) : false;
-                    let knotenSpgGeregelt = undefined;
-                    if (spannungsregelungRemote) {
-                        knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7Data.knotenspgreg));
-                    }
-                    let regulatingControl = undefined;
-                    if (spannungsregelungLokal || spannungsregelungRemote) {
-                        //Create and define regulating control for voltage control
-                        regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([shunt.getUUID().substring(0, 8), '_LSC']));
-                        regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                        regulatingControl.discrete = true; //default für ShuntCompensator ist true. s. CGMES Doku
-                        regulatingControl.targetDeadband = (0, parser_utils_1.isNumericI7)(i7Data.uband) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uband) : undefined; //zulässiges Spannungsband
-                        /** Spannung in kilo*/
-                        regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
-                        regulatingControl.enabled = true;
-                        if (knotenSpgGeregelt) {
-                            const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                            const terminal = (0, util_graph2tree_1.getControlledNode)(cn_point, knotenSpgGeregelt);
-                            if (terminal) {
-                                const cn = terminal.getConnectivityNode();
-                                if (regulatingControl.targetDeadband === undefined) {
-                                    regulatingControl.targetDeadband = cn.getBaseVoltageAsNumber() * 0.1;
-                                }
-                                regulatingControl.terminalUUID = terminal.getUUID();
-                                regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = cn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
-                                const tV = targetVoltages.get(this.UUID2Integral7ID.get(cn.getUUID()).find(elem => elem));
-                                if (tV && regulatingControl.targetValue === undefined) {
-                                    regulatingControl.targetValue = tV['usoll'];
-                                }
-                                regulatingControl.targetValue = targetVoltages.get((_b = this.UUID2Integral7ID.get(cn.getUUID())) === null || _b === void 0 ? void 0 : _b.find(elem => elem))['usoll'];
-                            }
-                        }
-                        regulatingControl.addRegulatingCondEq(shunt);
-                        shunt.regulatingControlUUID = regulatingControl.mrid;
-                        shunt.controlEnabled = regulatingControl === undefined ? false : regulatingControl.enabled;
-                        shunt.regulatingControl = regulatingControl;
-                        cimModel.addRegulatingControl(regulatingControl);
-                        const term = cimModel.terminals.get(regulatingControl.terminalUUID);
-                        if (term) {
-                            term.addRegulatingControl(regulatingControl);
-                        }
-                        else {
-                            let stop = true;
-                        }
-                    }
                     //SHC section
                     const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? i7Data.r0 : undefined;
                     const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? i7Data.x0 : undefined;
                     shunt.b0PerSection = (0, utils_2.calculateB0PerSection)(/*r0,*/ Math.abs(x0));
                     shunt.g0PerSection = (0, utils_2.calculateG0PerSection)(r0 /*,x0*/);
                     this.setShuntGrounding(shunt, sternpunktKnotenMap.get(i7Data.knoten1p), r0, x0);
-                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, shunt.regulatingControl, undefined, targetVoltages);
+                    this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, targetVoltages);
                     cimModel.addLinearShuntCompensator(shunt);
                     this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR);
                 }
@@ -2401,13 +2297,12 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertStatcom(cimModel, knotenSfIDs) {
+    convertStatcom(cimModel, targetVoltages, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STATCOM)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STATCOM, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STATCOM), knotenSfIDs));
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
                     const uref = (0, parser_utils_1.isNumericI7)(i7Data.uref) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uref) : undefined;
                     const mrez = (0, parser_utils_1.isNumericI7)(i7Data.mrez) ? (0, parser_utils_1.convertToNumberI7)(i7Data.mrez) : undefined;
@@ -2425,34 +2320,12 @@ class ConverterIntegral7 {
                     /** SV */
                     //statVarCom.svpowerflow
                     /** Regelung */
-                    const regulatingControl = (0, utils_2.createRegulatingControl)(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
-                    this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
-                    regulatingControl.enabled = true;
-                    statVarCom.controlEnabled = true;
-                    const flagOS = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_os);
-                    /** die Regelung erfolgt auf die Oberspannungsseite des zugehörenden Transformators */
-                    if (flagOS && i7Data.trafo) {
-                        const trafoUUID = this.integralID2UUID.get(i7Data.trafo);
-                        const powerTransformer = cimModel.getObject(trafoUUID);
-                        if (powerTransformer) {
-                            try {
-                                const bvNumbers = powerTransformer.powerTransformerEnd.map(elem => { var _a, _b; return (_b = (_a = elem.baseVoltage) === null || _a === void 0 ? void 0 : _a.nominalVoltage) === null || _b === void 0 ? void 0 : _b.value; });
-                                const maxBv = Math.max(...bvNumbers);
-                                const powerTransformerEnd = powerTransformer.powerTransformerEnd[bvNumbers.indexOf(maxBv)];
-                                regulatingControl.terminal = powerTransformerEnd.terminal;
-                                powerTransformerEnd.terminal.addRegulatingControl(regulatingControl);
-                                regulatingControl.targetValue = maxBv;
-                            }
-                            catch (e) {
-                                this.logger.debug(`Statcom Zuordnung zu Trafo fehlgeschlagen.`);
-                            }
-                        }
-                        else {
-                            this.logger.debug(`Statcom RegulatingControl ${i7Data.id} konnte dem Trafo ${i7Data.trafo} nicht zugeordnet werden.`);
-                        }
-                    }
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid_rc);
+                    const regulatingControl = this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, targetVoltages, undefined, true);
                     /** EQ */
-                    statVarCom.voltageSetPoint = regulatingControl.targetValue ? regulatingControl.targetValue : ur;
+                    if (regulatingControl) {
+                        statVarCom.voltageSetPoint = regulatingControl.targetValue ? regulatingControl.targetValue : ur;
+                    }
                     cimModel.addStaticVarCompensator(statVarCom);
                     this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.STATCOM);
                 }
@@ -2462,7 +2335,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertSVC(cimModel, knotenSfIDs) {
+    convertSVC(cimModel, targetVoltages, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SVC)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SVC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SVC), knotenSfIDs));
@@ -2485,33 +2358,7 @@ class ConverterIntegral7 {
                     statVarCom.q = (0, parser_utils_1.isNumericI7)(i7Data.q0svc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q0svc) : undefined;
                     /** SV */
                     //statVarCom.svpowerflow
-                    /** Regelung */
-                    const regulatingControl = (0, utils_2.createRegulatingControl)(`RC_Statcom_${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
-                    this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, regulatingControl);
-                    regulatingControl.enabled = true;
-                    statVarCom.controlEnabled = true;
-                    const flagOS = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_os);
-                    /** die Regelung erfolgt auf die Oberspannungsseite des zugehörenden Transformators */
-                    if (flagOS && i7Data.trafo) {
-                        const trafoUUID = this.integralID2UUID.get(i7Data.trafo);
-                        const powerTransformer = cimModel.getObject(trafoUUID);
-                        if (powerTransformer) {
-                            try {
-                                const bvNumbers = powerTransformer.powerTransformerEnd.map(elem => { var _a, _b; return (_b = (_a = elem.baseVoltage) === null || _a === void 0 ? void 0 : _a.nominalVoltage) === null || _b === void 0 ? void 0 : _b.value; });
-                                const maxBv = Math.max(...bvNumbers);
-                                const powerTransformerEnd = powerTransformer.powerTransformerEnd[bvNumbers.indexOf(maxBv)];
-                                regulatingControl.terminal = powerTransformerEnd.terminal;
-                                powerTransformerEnd.terminal.addRegulatingControl(regulatingControl);
-                                regulatingControl.targetValue = maxBv;
-                            }
-                            catch (e) {
-                                this.logger.debug(`Statcom Zuordnung zu Trafo fehlgeschlagen.`);
-                            }
-                        }
-                        else {
-                            this.logger.debug(`Statcom RegulatingControl ${i7Data.id} konnte dem Trafo ${i7Data.trafo} nicht zugeordnet werden.`);
-                        }
-                    }
+                    const regulatingControl = this.setTopologyEnergySourceConsumerObject(cimModel, statVarCom, i7Data, targetVoltages, undefined, false);
                     /** EQ */
                     statVarCom.voltageSetPoint = regulatingControl.targetValue ? regulatingControl.targetValue : ur;
                     cimModel.addStaticVarCompensator(statVarCom);
@@ -2529,10 +2376,9 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH), knotenSfIDs));
                 for (const i7Data of result) {
                     /** Containment DC DCConverterUnit */
-                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
-                    dcConverterUnit.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
+                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
                     dcConverterUnit.governorSCDAc = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                    dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.kr_dc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr_dc) : undefined;
+                    dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.krdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.krdc) : undefined;
                     // Topologie
                     /* Anfang
                      * 3 moegliche Anschluesse
@@ -2558,54 +2404,46 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const csConverter = new CsConverter_1.CsConverter((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CSC']), i7Data.kurzname);
+                    const csConverter = new CsConverter_1.CsConverter((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CSC']), i7Data.kurzname);
+                    const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
+                    const pges = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pges) : undefined;
                     /** Wenn Leitungen konvertiert werden, wird das Attribut operationMode gesetzt. */
                     csConverter.equipmentContainer = dcConverterUnit;
                     /** Bemessungsleistung (Gleichstromseite) in MW
                      * im CS-Fall S = P?
                      * Abhängig vom  */
-                    csConverter.baseS = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
+                    csConverter.baseS = pr;
                     /** Bemessungsspannung (Gleichstromseite) in kV*/
-                    csConverter.ratedUdc = (0, parser_utils_1.isNumericI7)(i7Data.udc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.udc) : ((0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined);
+                    csConverter.ratedUdc = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : ((0, parser_utils_1.isNumericI7)(i7Data.udc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.udc) : undefined);
+                    csConverter.ratedIdc = (0, utils_2.calculateRatedIdc)(csConverter.ratedUdc, pr);
                     /** spannungsabhängige Wirk-Verluste in kW bei Leerlauf mit Bemessungsspannung in kV*/
                     csConverter.idleLoss = (0, parser_utils_1.isNumericI7)(i7Data.p_leer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_leer) * Math.pow(10, -3) : undefined;
                     csConverter.maxUdc = csConverter.ratedUdc * 1.05; // +5% * ratedUdc
                     csConverter.minUdc = csConverter.ratedUdc * 0.95; // -5% * ratedUdc
-                    csConverter.resistiveLoss = 0;
+                    csConverter.resistiveLoss = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) * Math.pow(10, -3) : undefined;
                     csConverter.switchingLoss = 0;
                     /* csConverter.numberOfValves
                     csConverter.valveU0*/
                     /** Stromrichter */
                     /** Zündwinkel bei Gleichrichterbetrieb (ins Drehstromnetz eingespeiste Wirkleistung < 0) - etwa 15 Grad */
-                    /*    csConverter.maxAlpha = i7Data.alpha;
-                          csConverter.minAlpha = i7Data.alpha;*/
+                    csConverter.maxAlpha = 180;
+                    csConverter.minAlpha = (0, parser_utils_1.isNumericI7)(i7Data.alpha) ? (0, parser_utils_1.convertToNumberI7)(i7Data.alpha) : 15;
                     /** Löschwinkel bei Wechselrichterbetrieb (ins Drehstromnetz Wirkleistung > 0) - etwa 21,5 Grad */
-                    /*      csConverter.maxGamma = i7Data.gamma;
-                            csConverter.minGamma = i7Data.gamma;*/
+                    csConverter.maxGamma = undefined;
+                    csConverter.minGamma = (0, parser_utils_1.isNumericI7)(i7Data.gamma) ? (0, parser_utils_1.convertToNumberI7)(i7Data.gamma) : 21.5;
                     /** SSH profile export*/
-                    csConverter.p = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
+                    csConverter.p = pges ? pges * -1 : 0;
                     csConverter.q = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
-                    const regelungU = (0, parser_utils_1.convertToBooleanI7)(i7Data.u_geregelt);
-                    const regelungP = (0, parser_utils_1.convertToBooleanI7)(i7Data.p_geregelt);
-                    if (regelungU) {
-                        csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.inverter;
-                    }
-                    else if (regelungP) {
-                        csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
-                    }
-                    else {
-                        csConverter.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
-                    }
+                    this.setTopologyEnergySourceConsumerObject(cimModel, csConverter, i7Data);
                     /** Status */
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     csConverter.normallyInService = inBetrieb;
                     /** Topologie AC Seite*/
-                    if (acConnectivityNode) {
-                        csConverter.pccTerminal = this.createConnection(cimModel, csConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, true);
-                    }
-                    else {
-                        this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
-                    }
+                    /**if (acConnectivityNode) {
+                      csConverter.pccTerminal = this.reateConnection(cimModel, csConverter, acConnectivityNode, PhaseCode.ABC, true);
+                    } else {
+                      this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
+                    }**/
                     /** Topologie DC Seite*/
                     const dcNode = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodep, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
@@ -2631,17 +2469,27 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertVsConverterDC(cimModel, integral7, knotenSfIDs) {
-        var _a, _b;
+    convertVsConverterDC(cimModel, targetVoltages, integral7, knotenSfIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC), knotenSfIDs));
                 for (const i7Data of result) {
                     /** Containment DC DCConverterUnit */
-                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
-                    dcConverterUnit.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
+                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
+                    /** target voltage local*/
+                    const localTargetVoltage = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
+                    dcConverterUnit.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
                     dcConverterUnit.governorSCDAc = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
-                    dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.kr_dc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr_dc) : undefined;
+                    dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.krdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.krdc) : undefined;
+                    if (dcConverterUnit.governorSCDAc !== undefined) {
+                        this.logger.debug(`Object Kopfstation from Table ${integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC} has no governorSCDAc.`);
+                    }
+                    if (dcConverterUnit.governorSCDDc !== undefined) {
+                        this.logger.debug(`Object Kopfstation from Table ${integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC} has no governorSCDDc.`);
+                    }
+                    if (dcConverterUnit.referencePriority !== undefined) {
+                        this.logger.debug(`Object Kopfstation from Table ${integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC} has no referencePriority.`);
+                    }
                     // Topologie
                     /** Anfang
                      * 3 moegliche Anschluesse
@@ -2676,44 +2524,23 @@ class ConverterIntegral7 {
                     //If udc is set in Integral data model set converter.ratedUdc as i7Data.udc else take the data value for i7Data.ur (Bemessungsspannung)
                     vsConverter.ratedUdc = (0, parser_utils_1.isNumericI7)(i7Data.udc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.udc) : ((0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined);
                     /** spannungsabhängige Wirk-Verluste bei Leerlauf mit Bemessungsspannung in kV*/
-                    vsConverter.idleLoss = (0, parser_utils_1.isNumericI7)(i7Data.p_leer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_leer) / 1000 : undefined;
-                    vsConverter.maxUdc = vsConverter.ratedUdc * 1.05; // +5% * ratedUdc
-                    vsConverter.minUdc = vsConverter.ratedUdc * 0.95; // -5% * ratedUdc
-                    vsConverter.resistiveLoss = undefined;
+                    vsConverter.idleLoss = (0, parser_utils_1.isNumericI7)(i7Data.p_leer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_leer) * Math.pow(10, -3) : undefined;
+                    vsConverter.maxUdc = vsConverter.ratedUdc * 1.08; // +5% * ratedUdc
+                    vsConverter.minUdc = vsConverter.ratedUdc * 0.98; // -5% * ratedUdc
+                    vsConverter.resistiveLoss = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) * Math.pow(10, -3) : undefined;
                     vsConverter.switchingLoss = undefined;
                     /*  csConverter.maxModulationIndex = ;
                         csConverter.maxValveCurrent =  */
                     /** SSH export values */
                     vsConverter.p = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
                     vsConverter.q = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
-                    const regelungU = (0, parser_utils_1.convertToBooleanI7)(i7Data.u_geregelt);
-                    const regelungP = (0, parser_utils_1.convertToBooleanI7)(i7Data.p_geregelt);
-                    if (regelungU) {
-                        vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.udc;
-                        vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
-                        vsConverter.targetUpcc = (_a = acConnectivityNode === null || acConnectivityNode === void 0 ? void 0 : acConnectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getBaseVoltageAsNumber(); //Voltage
-                        vsConverter.targetUdc = vsConverter.ratedUdc;
-                    }
-                    else {
-                        vsConverter.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
-                        vsConverter.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
-                        vsConverter.targetPpcc = vsConverter.baseS * -1; //ActivePower
-                        vsConverter.targetUpcc = (_b = acConnectivityNode === null || acConnectivityNode === void 0 ? void 0 : acConnectivityNode.getVoltageLevel()) === null || _b === void 0 ? void 0 : _b.getBaseVoltageAsNumber();
-                        vsConverter.targetQpcc = 0; //ReactivePower
-                    }
+                    this.setTopologyEnergySourceConsumerObject(cimModel, vsConverter, i7Data, targetVoltages);
                     vsConverter.droop = 0; //pu
                     vsConverter.droopCompensation = 0; //Resistance
                     vsConverter.qShare = 0; //PerCent
                     /** Status */
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     vsConverter.normallyInService = inBetrieb;
-                    /** Topologie AC Seite*/
-                    if (acConnectivityNode) {
-                        vsConverter.pccTerminal = (0, util_create_1.createConnection)(cimModel, vsConverter, acConnectivityNode, PhaseCode_1.PhaseCode.ABC, 1);
-                    }
-                    else {
-                        this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
-                    }
                     /** Topologie DC Seite mit DCGround*/
                     const dcNode = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodep, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
@@ -2724,32 +2551,11 @@ class ConverterIntegral7 {
                     vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
                     dcNode.dcTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
-                    const dcGround = new DCGround_1.DCGround((0, parser_utils_1.getUUID)(i7Data.guid_dcground, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCG'], 32, true));
-                    const dcTerminalG = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalg, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
-                    const dcTerminalM1 = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalm1, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
-                    const dcNodeG = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodem1, this.objectMappingConfig.standardiseUuid));
-                    dcTerminalG.dCConductingEquipment = dcGround;
-                    dcTerminalM1.dCConductingEquipment = vsConverter;
-                    dcTerminalM1.polarity = DCPolarityKind_1.DCPolarityKind.middle;
-                    dcTerminalG.dcNode = dcNodeG;
-                    dcTerminalM1.dcNode = dcNodeG;
-                    dcGround.equipmentContainer = dcConverterUnit;
-                    dcNodeG.dcEquipmentContainer = dcConverterUnit;
-                    dcNodeG.dcTerminals.set(dcTerminalG.getUUID(), dcTerminalG);
-                    dcNodeG.dcTerminals.set(dcTerminalM1.getUUID(), dcTerminalM1);
-                    vsConverter.dCTerminals.set(dcTerminalM1.getUUID(), dcTerminalM1);
-                    /** EQ-SC */
-                    dcGround.r = undefined;
-                    dcGround.inductance = undefined;
                     /** DCNode speichern, um später DCLines anschließen zu können*/
                     cimModel.addDCConverterUnit(dcConverterUnit);
                     cimModel.addVSConverter(vsConverter);
                     cimModel.addDCNode(dcNode);
-                    cimModel.addDCNode(dcNodeG);
                     cimModel.addACDCConverterDCTerminal(acDCConverterDCTerminal);
-                    cimModel.addDCTerminal(dcTerminalG);
-                    cimModel.addDCGround(dcGround);
-                    cimModel.addACDCConverterDCTerminal(dcTerminalM1);
                     integral7.integralHgueKopf.set(i7Data.id, i7Data);
                     this.checkAnschlussIDs(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, vsConverter.mrid, integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC);
@@ -2757,7 +2563,7 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertEinspeisungen2EnergySource(cimModel, result, energySourceTypeMappingConfig) {
+    convertEinspeisungen2EnergySource(cimModel, targetVoltages, result, energySourceTypeMappingConfig) {
         var _a, _b, _c, _d;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
@@ -2802,37 +2608,15 @@ class ConverterIntegral7 {
             }
         });
     }
-    convertEnergySourceToExternalNetworkInjection(cimModel, i7Data, prio, inBetrieb) {
+    convertEnergySourceToExternalNetworkInjection(cimModel, targetVoltages, i7Data, prio, inBetrieb) {
         const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
         const externalNetworkInjection = new ExternalNetworkInjection_1.ExternalNetworkInjection(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_EI'], 32, true), i7Data.kurzname);
         externalNetworkInjection.referencePriority = prio;
         const usoll = i7Data.usoll;
-        // RegulatingControl
-        let regulatingControl = undefined;
-        // TODO targetDeadband: ab welcher spannung soll reguliert werden.
-        switch (i7Data.spannungsgeregelt) {
-            // TODO Welche Modi sind möglich?
-            case 1: {
-                const cimrdfid = (0, parser_utils_1.getUUID)(externalNetworkInjection.getUUID(), this.objectMappingConfig.standardiseUuid);
-                regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
-                regulatingControl.targetValue = usoll;
-                regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                regulatingControl.discrete = false;
-                regulatingControl.enabled = true;
-                externalNetworkInjection.controlEnabled = true;
-                regulatingControl.addRegulatingCondEq(externalNetworkInjection);
-                externalNetworkInjection.regulatingControl = regulatingControl;
-                cimModel.addRegulatingControl(regulatingControl);
-                break;
-            }
-            default: {
-                externalNetworkInjection.controlEnabled = false;
-            }
-        }
         const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
         externalNetworkInjection.p = powerData[0];
         externalNetworkInjection.q = powerData[1];
-        this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
+        this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, targetVoltages);
         cimModel.addExternalNetworkInjection(externalNetworkInjection);
         this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
     }
@@ -2858,20 +2642,19 @@ class ConverterIntegral7 {
                     this.addIdMapping(i7Data.id, equivalentInjection.mrid, integral_sql_1.Integral7TableNames.EINSPEISUNG);
                 }
                 catch (err) {
-                    this.logger.error(`Err convertEinspeisungen2EquivalentInjection ${i7Data.id} ${err}`);
+                    this.logger.error(`error --- convertEinspeisungen2EquivalentInjection ${i7Data.id} ${err}`);
                 }
             }
         });
     }
-    convertEinspeisungen2ExternalNetworkInjection(cimModel, result) {
+    convertEinspeisungen2ExternalNetworkInjection(cimModel, targetVoltages, result) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    const cn = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
-                    // const un = cn.getVoltageLevel().getBaseVoltageAsNumber();
-                    externalNetworkInjection.nameprimaertyp = i7Data.nameprimaertyp;
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);
+                    externalNetworkInjection.nameprimaertyp = i7Data.nameprimaertyp !== undefined ? i7Data.nameprimaertyp : undefined;
                     let mf = undefined;
                     mf = this.cimModelDefault.multiplierFactors.get(this.integralID2UUID.get(i7Data.multfaktor));
                     if (mf) {
@@ -2890,15 +2673,8 @@ class ConverterIntegral7 {
                     externalNetworkInjection.minP = minP;
                     const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
                     externalNetworkInjection.minQ = minQ;
-                    /** bei nicht modellierter Einspeisepriorität,
-                     * erfolgt keine Wirkleistungsregelung */
-                    if (this.objectMappingConfig.Target === 'Westnetz' && !einspeisePrioritaet) {
-                        externalNetworkInjection.maxP = 0;
-                        externalNetworkInjection.minP = 0;
-                    }
-                    const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
-                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
-                    //TODO: get data from database
+                    /** Convert EQ-profile dataset. */
+                    this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, targetVoltages);
                     /**Convert short circuit constants */
                     const r0X0 = (0, parser_utils_1.isNumericI7)(i7Data.x0_r0) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x0_r0) : undefined;
                     const r1X1 = (0, parser_utils_1.isNumericI7)(i7Data.x1_r1) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x1_r1) : undefined;
@@ -2907,7 +2683,7 @@ class ConverterIntegral7 {
                     externalNetworkInjection.maxR0ToX0Ratio = maxR0X0Ratio;
                     const maxR1X1Ratio = (0, parser_utils_1.isNumericI7)(i7Data.x1_r1_max) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x1_r1_max) : r1X1;
                     externalNetworkInjection.maxR1ToX1Ratio = maxR1X1Ratio;
-                    const maxZ0Z1Ratio = (0, parser_utils_1.isNumericI7)(i7Data.z0_z1_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.z0_z1_max) : z0Z1;
+                    const maxZ0Z1Ratio = z0Z1;
                     externalNetworkInjection.maxZ0ToZ1Ratio = maxZ0Z1Ratio;
                     const minR0X0Ratio = (0, parser_utils_1.isNumericI7)(i7Data.x0_r0_min) ? 1 / (0, parser_utils_1.convertToNumberI7)(i7Data.x0_r0_min) : r0X0;
                     externalNetworkInjection.minR0ToX0Ratio = minR0X0Ratio;
@@ -2922,41 +2698,22 @@ class ConverterIntegral7 {
                     externalNetworkInjection.minInitialSymShCCurrent = minIkSecond;
                     const maxIkSecond = (0, parser_utils_1.isNumericI7)(i7Data.sk_max) ? (0, parser_utils_1.convertToNumberI7)(skMax) / Math.sqrt(3) * skMax : undefined;
                     externalNetworkInjection.maxInitialSymShCCurrent = maxIkSecond;
-                    // RegulatingControl
-                    let regulatingControl = undefined;
-                    // TODO targetDeadband: ab welcher spannung soll reguliert werden.
-                    switch (i7Data.spannungsgeregelt) {
-                        // TODO Welche Modi sind möglich?
-                        case 1: {
-                            const cimrdfid = (0, parser_utils_1.getUUID)(externalNetworkInjection.getUUID(), this.objectMappingConfig.standardiseUuid);
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([cimrdfid.substring(0, 8), '_RC_ENI'], 32, true));
-                            regulatingControl.targetValue = usoll;
-                            regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
-                            regulatingControl.discrete = false;
-                            regulatingControl.enabled = true;
-                            externalNetworkInjection.controlEnabled = true;
-                            regulatingControl.addRegulatingCondEq(externalNetworkInjection);
-                            externalNetworkInjection.regulatingControl = regulatingControl;
-                            cimModel.addRegulatingControl(regulatingControl);
-                            break;
-                        }
-                        default: {
-                            externalNetworkInjection.controlEnabled = false;
-                        }
-                    }
-                    this.setTopologyEnergySourceConsumerObject(cimModel, externalNetworkInjection, i7Data, regulatingControl);
-                    // ToDo PSRType
+                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : false;
                     /** Convert SSH-profile dataset. */
                     /**
-                     * @description Set einspprio as referencePriority. PowerFactory sets external network injections with referencePriority to has slack control mode. In regular case referencePriority for externalnetworkextensions is set to value '0'.
+                     * @description Set einspprio as referencePriority. PowerFactory sets external network injections with referencePriority == 1, to slack control mode. In regular case referencePriority for externalnetworkextensions is set to value '0'.
                      *                einspprio having no effect in loadflow calculation if voltage control does not exists.
                      * */
-                    if ((regulatingControl === null || regulatingControl === void 0 ? void 0 : regulatingControl.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
-                        if (einspeisePrioritaet && einspeisePrioritaet > 0) {
-                            externalNetworkInjection.referencePriority = einspeisePrioritaet + 1;
+                    let prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
+                    if (((_a = externalNetworkInjection.regulatingControl) === null || _a === void 0 ? void 0 : _a.mode) === RegulatingControlModeKind_1.RegulatingControlModeKind.voltage) {
+                        if (prio !== undefined && prio > 0) {
+                            externalNetworkInjection.referencePriority = prio + 1; //TODO: SLACK is a injection with maximum prio in the network section and active voltage control.
+                        }
+                        else if (prio !== undefined && prio === 0) {
+                            externalNetworkInjection.referencePriority = prio;
                         }
                         else {
-                            einspeisePrioritaet = undefined;
+                            externalNetworkInjection.referencePriority = undefined;
                         }
                     }
                     const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
@@ -2964,43 +2721,352 @@ class ConverterIntegral7 {
                     const q = powerData[1];
                     externalNetworkInjection.setActivePower(p * -1); //convert to load sign system
                     externalNetworkInjection.setReactivePower(q * -1); //convert to load sign system
-                    externalNetworkInjection.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
-                    externalNetworkInjection.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
+                    // AMPI7 profile
+                    const cosPhi = (0, parser_utils_1.isNumericI7)(i7Data.cos_phi) ? ((0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) !== 0 ? (0, parser_utils_1.convertToNumberI7)(i7Data.cos_phi) : 1) : undefined;
+                    externalNetworkInjection.cos_phi = cosPhi;
+                    externalNetworkInjection.p_mf = (mf && powerData[2]) ? powerData[2] * -1 : undefined;
+                    externalNetworkInjection.q_mf = (mf && powerData[3]) ? powerData[3] * -1 : undefined;
+                    externalNetworkInjection.normallyInService = inBetrieb;
                     cimModel.addExternalNetworkInjection(externalNetworkInjection);
                     this.addIdMapping(i7Data.id, externalNetworkInjection.mrid, integral_sql_1.I7Objects.EINSPEISUNG);
                 }
                 catch (err) {
-                    this.logger.error(`Err convertEinspeisungen2ExternalNetworkInjection ${i7Data.id} ${err}`);
+                    this.logger.error(`error --- convertEinspeisungen2ExternalNetworkInjection ${i7Data.id} ${err}`);
                 }
             }
         });
     }
-    setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, regulatingControl, generatingUnit, targetVoltages) {
-        var _a, _b, _c;
+    setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, targetVoltages, generatingUnit, isStatcom) {
+        var _a, _b, _c, _d;
         const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
         condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-        let controlledTerm = undefined;
+        let usoll = undefined;
+        let rControl = undefined;
+        let i7DataEinsp = undefined;
+        let i7DataSVC = undefined;
+        let i7DataKomp = undefined;
+        let i7DataRQ = undefined;
+        let i7DataHgue = undefined;
+        let suffix = undefined;
+        let uband = undefined;
+        let tCn = undefined; //controlled node of this device
+        let spannungsregelungLokal = undefined;
+        let spannungsregelungRemote = undefined;
+        let knotenSpgGeregelt = undefined;
+        let isRegulatingControl = undefined;
+        let hasGeneratingUnit = undefined;
+        if (condEquip instanceof RotatingMachine_1.RotatingMachine || condEquip instanceof ExternalNetworkInjection_1.ExternalNetworkInjection || condEquip instanceof EquivalentInjection_1.EquivalentInjection) {
+            i7DataEinsp = i7Data;
+            i7DataRQ = i7Data;
+        }
+        if (condEquip instanceof SynchronousMachine_1.SynchronousMachine) {
+            suffix = '_SM';
+            if (generatingUnit !== undefined) {
+                hasGeneratingUnit = true;
+            }
+            else {
+                hasGeneratingUnit = false;
+            }
+        }
+        else if (condEquip instanceof AsynchronousMachine_1.AsynchronousMachine) {
+            suffix = '_ASM';
+        }
+        else if (condEquip instanceof ExternalNetworkInjection_1.ExternalNetworkInjection) {
+            suffix = '_ENI';
+        }
+        else if (condEquip instanceof EquivalentInjection_1.EquivalentInjection) {
+            suffix = '_EI';
+        }
+        else if (condEquip instanceof StaticVarCompensator_1.StaticVarCompensator) {
+            i7DataSVC = i7Data;
+            i7DataRQ = i7Data;
+            suffix = '_SVC';
+        }
+        else if (condEquip instanceof LinearShuntCompensator_1.LinearShuntCompensator) {
+            i7DataKomp = i7Data;
+            i7DataRQ = i7Data;
+            suffix = '_LSC';
+        }
+        else if (condEquip instanceof ACDCConverter_1.ACDCConverter) {
+            i7DataHgue = i7Data;
+            suffix = '_ACDCC';
+        }
+        // RegulatingControl: Test if this is a regulating control.
+        if (i7DataEinsp) {
+            spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7DataEinsp.spannungsgeregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7DataEinsp.spannungsgeregelt) : false;
+            spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7DataEinsp.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7DataEinsp.rpv_geregelt) : false;
+            knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7DataEinsp.knotenspgreg));
+            isRegulatingControl = spannungsregelungLokal || spannungsregelungRemote;
+        }
+        else if (i7DataKomp) {
+            spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7DataKomp.flag_lf) ? (0, parser_utils_1.convertToBooleanI7)(i7DataKomp.flag_lf) : false;
+            spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7DataKomp.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7DataKomp.rpv_geregelt) : false;
+            knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7DataKomp.knotenspgreg));
+            isRegulatingControl = spannungsregelungLokal || spannungsregelungRemote;
+        }
+        else if (i7DataHgue) {
+            spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7DataHgue.spannungsgeregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.spannungsgeregelt) : false;
+            spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7DataHgue.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.rpv_geregelt) : false;
+            knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7DataHgue.knotenspgreg));
+            isRegulatingControl = false;
+        }
+        else if (i7DataSVC) {
+            isRegulatingControl = true;
+        }
+        else {
+            isRegulatingControl = false;
+        }
         if (connectivityNode) {
-            const terminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
-            controlledTerm = terminal;
-            if (regulatingControl) {
-                if (regulatingControl.terminalUUID === undefined) {
-                    if (!(controlledTerm.conductingEquipment instanceof BusbarSection_1.BusbarSection)) {
-                        controlledTerm = (0, util_graph2tree_1.getControlledNode)(connectivityNode, undefined);
-                    }
-                    regulatingControl.terminalUUID = terminal.getUUID();
-                    regulatingControl.name = (0, util_create_1.createNotation)([regulatingControl.name, '_', (_a = connectivityNode.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8), '_RC'], 32, true);
-                    if (regulatingControl.targetValue === undefined) {
-                        const tV = targetVoltages === null || targetVoltages === void 0 ? void 0 : targetVoltages.get(this.UUID2Integral7ID.get(connectivityNode.getUUID()).find(elem => elem));
-                        if (tV) {
-                            regulatingControl.targetValue = tV['usoll'];
+            const cpTerminal = this.createConnection(cimModel, condEquip, connectivityNode, PhaseCode_1.PhaseCode.ABC, true);
+            //create regulating control
+            if (isRegulatingControl && (i7DataEinsp || i7DataKomp)) {
+                let cterminal = undefined; //connection point terminal of this device
+                let tVMax = undefined; //maximum target voltage
+                let tVMin = undefined; //minimum target voltage
+                const regCondEquip = condEquip;
+                if (spannungsregelungLokal || spannungsregelungRemote) {
+                    //get rated voltage of controlled node.
+                    if (knotenSpgGeregelt && spannungsregelungRemote) {
+                        cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
+                        if (cterminal === undefined) {
+                            let stop = true;
+                        }
+                        if (cterminal) {
+                            tCn = cterminal.getConnectivityNode();
+                            if (tCn) {
+                                tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
+                                tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
+                                usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                            }
+                            else {
+                                this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Entfernt geregelter Knoten konnte nicht ermittelt werden.`);
+                            }
+                        }
+                        else {
+                            this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Anschlusspunkt (Terminal) des entfernt geregelter Knoten konnte nicht ermittelt werden.`);
+                        }
+                    }
+                    if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal) {
+                        switch (knotenSpgGeregelt) {
+                            case undefined: {
+                                cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+                                if (cterminal === undefined) {
+                                    cterminal = (0, util_graph2tree_1.getControlledNode)(cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)), cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)));
+                                }
+                                break;
+                            }
+                            default: {
+                                cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
+                            }
+                        }
+                        if (cterminal) {
+                            tCn = cterminal.getConnectivityNode();
+                            if (tCn) {
+                                tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
+                                tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
+                                usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                            }
+                            else {
+                                this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Lokal geregelter Knoten konnte nicht ermittelt werden.`);
+                            }
+                        }
+                    }
+                    uband = (0, parser_utils_1.isNumericI7)(tVMax) && (0, parser_utils_1.isNumericI7)(tVMin) ? (0, parser_utils_1.convertToNumberI7)(tVMax) - (0, parser_utils_1.convertToNumberI7)(tVMin) : undefined;
+                    if (uband === undefined) {
+                        if (tCn) {
+                            uband = tCn.getBaseVoltageAsNumber() * 0.1;
+                        }
+                    }
+                }
+                //Create and define regulating control for voltage control
+                if (cterminal !== undefined) {
+                    const uuid = (0, parser_utils_1.getUUID)(i7DataRQ.guid_rc);
+                    rControl = (0, utils_2.createRegulatingControl)((0, parser_utils_1.getUUID)(i7DataRQ.guid_rc), (0, util_create_1.createNotation)([regCondEquip.getUUID().substring(0, 8), suffix]), true, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage);
+                    if (i7DataEinsp) {
+                        rControl.discrete = false; //default for ExternalNetworkInjection is false. s. CGMES Doku
+                    }
+                    else {
+                        rControl.discrete = true; //default for LinearShuntCompensator is true because of stepping mode.
+                    }
+                    rControl.targetDeadband = (0, parser_utils_1.isNumericI7)(uband) ? uband : undefined; //zulässiges Spannungsband
+                    /** Spannung in kilo*/
+                    rControl.targetValue = usoll;
+                    const guidSuffix = (_a = tCn === null || tCn === void 0 ? void 0 : tCn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8);
+                    rControl.name = (0, util_create_1.createNotation)([rControl.name, '_', guidSuffix, '_RC'], 32, true);
+                    rControl.terminalUUID = cterminal.getUUID();
+                    rControl.addRegulatingCondEq(regCondEquip);
+                    regCondEquip.regulatingControlUUID = rControl.mrid;
+                    regCondEquip.controlEnabled = rControl === undefined ? false : rControl.enabled;
+                    regCondEquip.regulatingControl = rControl;
+                    cimModel.addRegulatingControl(rControl);
+                    const term = cimModel.terminals.get(rControl.terminalUUID);
+                    if (term) {
+                        term.addRegulatingControl(rControl);
+                    }
+                }
+                else {
+                    const stop = true;
+                }
+            }
+            else if (isRegulatingControl && i7DataSVC) {
+                /** Regelung */
+                const regCondEquip = condEquip;
+                const cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+                let tVMax = undefined;
+                let tVMin = undefined;
+                if (cterminal) {
+                    tCn = cterminal.getConnectivityNode();
+                    if (tCn) {
+                        tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
+                        tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
+                        usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                    }
+                    else {
+                        this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Lokal geregelter Knoten konnte nicht ermittelt werden.`);
+                    }
+                }
+                uband = (0, parser_utils_1.isNumericI7)(tVMax) && (0, parser_utils_1.isNumericI7)(tVMin) ? (0, parser_utils_1.convertToNumberI7)(tVMax) - (0, parser_utils_1.convertToNumberI7)(tVMin) : undefined;
+                if (uband === undefined) {
+                    if (tCn) {
+                        uband = tCn.getBaseVoltageAsNumber() * 0.1;
+                    }
+                }
+                if (cterminal !== undefined) {
+                    const uuid = (0, parser_utils_1.getUUID)(i7DataSVC.guid_rc);
+                    rControl = (0, utils_2.createRegulatingControl)(uuid, (0, util_create_1.createNotation)([condEquip.getUUID().substring(0, 8), suffix]), inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage);
+                    rControl.enabled = true;
+                    if (isStatcom) {
+                        rControl.discrete = true;
+                    }
+                    else {
+                        rControl.discrete = false;
+                    }
+                    condEquip.controlEnabled = true;
+                    const flagOS = (0, parser_utils_1.convertToBooleanI7)(i7DataSVC.flag_os);
+                    /** die Regelung erfolgt auf die Oberspannungsseite des zugehörenden Transformators */
+                    if (flagOS && i7DataSVC.trafo) {
+                        const trafoUUID = this.integralID2UUID.get(i7DataSVC.trafo);
+                        const powerTransformer = cimModel.getObject(trafoUUID);
+                        if (powerTransformer) {
+                            try {
+                                for (const end of powerTransformer.powerTransformerEnd) {
+                                    if (end.phaseTapChanger) {
+                                        end.phaseTapChanger.controlEnabled = false;
+                                    }
+                                    if (end.ratioTapChanger) {
+                                        end.ratioTapChanger.controlEnabled = false;
+                                    }
+                                }
+                            }
+                            catch (e) {
+                                this.logger.debug(`debug --- ${i7DataSVC.constructor.name} Zuordnung zu Trafo fehlgeschlagen.`);
+                            }
                         }
                     }
+                    rControl.targetValue = usoll;
+                    rControl.targetDeadband = uband;
+                    rControl.terminal = cterminal;
+                    const guidSuffix = (_b = tCn === null || tCn === void 0 ? void 0 : tCn.getVoltageLevel()) === null || _b === void 0 ? void 0 : _b.getUUID().substring(0, 8);
+                    rControl.name = (0, util_create_1.createNotation)([rControl.name, '_', guidSuffix, '_RC'], 32, true);
+                    regCondEquip.regulatingControlUUID = rControl.mrid;
+                    regCondEquip.controlEnabled = rControl === undefined ? false : rControl.enabled;
+                    regCondEquip.regulatingControl = rControl;
+                    cterminal.addRegulatingControl(rControl);
+                    cimModel.addRegulatingControl(rControl);
+                }
+                else {
+                    const stop = true;
                 }
             }
-            const equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, connectivityNode.connectivityNodeContainer);
+            else if (i7DataHgue) {
+                let cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+                const regelungU = (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.u_geregelt);
+                const regelungP = (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.p_geregelt);
+                condEquip.pccTerminal = cpTerminal;
+                if (condEquip instanceof CsConverter_1.CsConverter) {
+                    if (regelungU) {
+                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.inverter;
+                        condEquip.pPccControl = CsPpccControlKind_1.CsPpccControlKind.dcVoltage;
+                        condEquip.targetUdc = (0, parser_utils_1.isNumericI7)(i7DataHgue.udc) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.udc) : condEquip.ratedUdc;
+                    }
+                    else if (regelungP) {
+                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
+                        condEquip.pPccControl = CsPpccControlKind_1.CsPpccControlKind.activePower;
+                        condEquip.targetPpcc = (0, parser_utils_1.isNumericI7)(i7DataHgue.pges) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pges) : ((0, parser_utils_1.isNumericI7)(i7DataHgue.pr) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pr) : undefined);
+                    }
+                    else {
+                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
+                        condEquip.pPccControl = CsPpccControlKind_1.CsPpccControlKind.activePower;
+                        condEquip.targetPpcc = (0, parser_utils_1.isNumericI7)(i7DataHgue.pges) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pges) : ((0, parser_utils_1.isNumericI7)(i7DataHgue.pr) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pr) : undefined);
+                    }
+                }
+                else if (condEquip instanceof VsConverter_1.VsConverter) {
+                    usoll = (0, parser_utils_1.isNumericI7)(i7DataHgue.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.usoll) : undefined;
+                    if (regelungU) {
+                        condEquip.pPccControl = VsPpccControlKind_1.VsPpccControlKind.udc;
+                        condEquip.targetUdc = condEquip.ratedUdc;
+                    }
+                    else if (regelungP) {
+                        condEquip.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
+                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
+                        condEquip.targetPpcc = condEquip.baseS * -1; //ActivePower
+                        condEquip.targetQpcc = 0; //ReactivePower, TODO: define ReactivePowerCapabilityCurve
+                    }
+                    if (spannungsregelungLokal || spannungsregelungRemote) {
+                        //get rated voltage of controlled node.
+                        if (knotenSpgGeregelt && spannungsregelungRemote) {
+                            cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
+                            if (cterminal === undefined) {
+                                let stop = true;
+                            }
+                            if (cterminal) {
+                                tCn = cterminal.getConnectivityNode();
+                                if (tCn) {
+                                    usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                                }
+                                else {
+                                    this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Entfernt geregelter Knoten konnte nicht ermittelt werden.`);
+                                }
+                            }
+                            else {
+                                this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Anschlusspunkt (Terminal) des entfernt geregelter Knoten konnte nicht ermittelt werden.`);
+                            }
+                        }
+                        else if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal && usoll === undefined) {
+                            switch (knotenSpgGeregelt) {
+                                case undefined: {
+                                    if (cterminal === undefined) {
+                                        cterminal = (0, util_graph2tree_1.getControlledNode)(cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)), cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)));
+                                    }
+                                    break;
+                                }
+                                default: {
+                                    cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
+                                }
+                            }
+                            if (cterminal) {
+                                tCn = cterminal.getConnectivityNode();
+                                if (tCn) {
+                                    usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
+                                }
+                            }
+                        }
+                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
+                        if (usoll !== undefined) {
+                            condEquip.targetUpcc = usoll;
+                        }
+                        else {
+                            this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Sollspannung konnte nicht ermittelt werden.`);
+                        }
+                    }
+                }
+            }
+            let equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, connectivityNode.connectivityNodeContainer);
             if (equipmentContainer) {
+                if (condEquip instanceof ACDCConverter_1.ACDCConverter) {
+                    equipmentContainer = condEquip.equipmentContainer;
+                }
                 condEquip.equipmentContainer = equipmentContainer;
                 equipmentContainer.addEquipment(condEquip);
                 //TODO: Überarbeitung notwendig, da hier der Präfix nicht eindeutig für Einspeisungen ermittelt werden kann.
@@ -3021,27 +3087,36 @@ class ConverterIntegral7 {
                     i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
                         integral_prefix_1.EINSPEISUNG_PRAEFIX + i7Data.bezeichner;
                 }
+                else if (condEquip instanceof VsConverter_1.VsConverter) {
+                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                        integral_prefix_1.HGUEKOPFVSC_PRAEFIX + i7Data.bezeichner;
+                }
+                else if (condEquip instanceof CsConverter_1.CsConverter) {
+                    i7Schluessel = (0, utils_2.getDescription)(equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) +
+                        integral_prefix_1.HGUEKOPFKLASSISCH_PRAEFIX + i7Data.bezeichner;
+                }
                 condEquip.description = i7Schluessel;
-                if (generatingUnit) {
+                if (hasGeneratingUnit) {
                     const substation = this.determineEquipmentContainer('Substation', cimModel, equipmentContainer);
                     generatingUnit.equipmentContainer = substation;
                 }
             }
             else {
-                this.logger.error(`${(_b = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _b === void 0 ? void 0 : _b.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                this.logger.error(`error --- ${(_c = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _c === void 0 ? void 0 : _c.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
             }
         }
         else {
-            this.logger.error(`${(_c = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _c === void 0 ? void 0 : _c.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
+            this.logger.error(`error --- ${(_d = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _d === void 0 ? void 0 : _d.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
         }
+        return rControl;
     }
     convertQuerkupplungen(cimModel, integral7, schaltanlagenAbschnittIDs) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.QUERKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.QUERKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.QUERKUPPLUNG), schaltanlagenAbschnittIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), 'Querkupplung');
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_B']), 'Querkupplung');
                     bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.saabschnitt));
@@ -3049,12 +3124,12 @@ class ConverterIntegral7 {
                         bay.voltageLevel = voltageLevel;
                         voltageLevel.addBay(bay);
                         const i7Schluessel = voltageLevel.description +
-                            '/QK-' +
+                            integral_prefix_1.QUERKUPPLUNG_PRAEFIX +
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                         bay.description = i7Schluessel;
                     }
                     else {
-                        this.logger.debug(`Querkupplung ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.debug(`debug --- Querkupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
                     integral7.querkupplungIDs.push(i7Data.id);
                     cimModel.addBay(bay);
@@ -3062,7 +3137,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.QUERKUPPLUNG} ist nicht vorhanden.`);
+                this.logger.debug(`debug --- Tabelle ${integral_sql_1.Integral7TableNames.QUERKUPPLUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -3071,8 +3146,8 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
@@ -3085,7 +3160,7 @@ class ConverterIntegral7 {
                         bay.description = i7Schluessel;
                     }
                     else {
-                        this.logger.debug(`Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
+                        this.logger.debug(`debug --- Laengskupplung ${i7Data.id} besitzt keine Anlage.`);
                     }
                     const lKupplungImpl = new Laengskupplung_1.LaengskupplungImpl(i7Data);
                     integral7.integralLaengskupplungen.set(i7Data.id, lKupplungImpl);
@@ -3095,7 +3170,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
+                this.logger.debug(`debug --- Tabelle ${integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG} ist nicht vorhanden.`);
             }
         });
     }
@@ -3273,11 +3348,8 @@ class ConverterIntegral7 {
                     /** Spannungsebene */
                     const baseVoltages = (0, utils_2.getTerminalUn)(cimModel, bdf, seriesCompensator);
                     seriesCompensator.baseVoltage = baseVoltages[0] ? baseVoltages[0] : baseVoltages[1];
-                    if (seriesCompensator.baseVoltage === undefined) {
-                        let stop = true;
-                    }
                     /** EQ */
-                    const ur = (0, utils_2.getU)(i7Data.ur);
+                    const ur = seriesCompensator.baseVoltage.nominalVoltage.value; //getU(i7Data.ur);
                     const ir = (0, parser_utils_1.isNumericI7)(i7Data.ir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ir) : undefined;
                     const ukr = (0, parser_utils_1.isNumericI7)(i7Data.ukr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ukr) : undefined;
                     const pkr = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) : undefined;
@@ -3290,7 +3362,7 @@ class ConverterIntegral7 {
                     /** CurrentLimit */
                     const terminal = startTerminal;
                     if (terminal) {
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir);
+                        this.setConductingEquipmentOperationalLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir, new CurrentLimit_1.CurrentLimit());
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
@@ -3361,9 +3433,9 @@ class ConverterIntegral7 {
                     bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten)));
                     /** Spannungsebene */
                     const baseVoltages = (0, utils_2.getTerminalUn)(cimModel, bdf, seriesCompensator);
-                    seriesCompensator.baseVoltage = baseVoltages[0];
+                    seriesCompensator.baseVoltage = baseVoltages[0] ? baseVoltages[0] : baseVoltages[1];
                     /** EQ */
-                    const ur = (0, utils_2.getU)(i7Data.ur);
+                    const ur = seriesCompensator.baseVoltage.nominalVoltage.value; //getU(i7Data.ur);
                     const ir = (0, parser_utils_1.isNumericI7)(i7Data.ir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ir) : undefined;
                     const ukr = (0, parser_utils_1.isNumericI7)(i7Data.ukr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ukr) : undefined;
                     const pkr = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) : undefined;
@@ -3376,7 +3448,7 @@ class ConverterIntegral7 {
                     /** CurrentLimit */
                     const terminal = startTerminal;
                     if (terminal) {
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir);
+                        this.setConductingEquipmentOperationalLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir, new CurrentLimit_1.CurrentLimit());
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
@@ -3447,6 +3519,7 @@ class ConverterIntegral7 {
                             }
                             // Verbindung herstellen
                             const terminal = this.createConnection(cimModel, junction, connectivityNode, PhaseCode_1.PhaseCode.N, true);
+                            cimModel.terminals.delete(terminal.mrid); //TODO: complete/repair implementation of star point connections.
                             integral7.sternPunktImpModel.connectivityNodes.set(connectivityNode.mrid, connectivityNode);
                             integral7.sternPunktImpModel.junctions.set(junction.mrid, junction);
                             integral7.sternPunktImpModel.stpSchieneJunctionUUIDs.set(i7DataSchiene.id, junction.mrid);
@@ -3499,6 +3572,7 @@ class ConverterIntegral7 {
                             // Verbindung herstellen
                             if (connectivityNode) {
                                 const terminal = this.createConnection(cimModel, conductingEquip, connectivityNode, PhaseCode_1.PhaseCode.N, true);
+                                cimModel.terminals.delete(terminal.mrid); //TODO: complete/repair implementation of star point connections.
                             }
                         }
                     }
@@ -3557,8 +3631,8 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG)) {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LAENGSKUPPLUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LAENGSKUPPLUNG), schaltanlagenIDs));
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_B']), i7Data.kurzname, 'Laengskupplung');
                     const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Data.schaltanlage));
                     bay.number = (0, parser_utils_1.isNumericI7)(i7Data.feldnummer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.feldnummer).toString() : undefined;
                     bay.locationID = i7Data.ips_folder_id;
@@ -3624,6 +3698,7 @@ class ConverterIntegral7 {
         object.x0 = +data.x0; // new ReactancePerLength(data.x1, UnitMultiplier.none, UnitSymbol.ohm);
         object.c0 = +data.c0; // new CapacitancePerLength(data.c1, UnitMultiplier.micro, UnitSymbol.F);
         object.ratedCurrent = +data.ir;
+        object.limitingCurrent = +data.igrenz;
     }
     convertLeitungen(frame, integral7, defaultValuesConfig) {
         var _a, _b, _c;
@@ -3632,9 +3707,6 @@ class ConverterIntegral7 {
                 const cimModel = frame.cimModel;
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.LEITUNG), integral7.leitungsAnschlussIDs));
                 const leitungIDs = result.map(elem => elem.id);
-                const lt1 = leitungIDs.find(it => it === 105031594);
-                /*      const lt2 = leitungIDs.find(it => it === 105031293);
-                      const lt2 = leitungIDs.find(it => it === 105031293);*/
                 const cableAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.KABEL);
                 const overheadAvailable = this.isTableAvailable(integral_sql_1.Integral7TableNames.FREILEITUNG);
                 let type = integral_sql_1.I7Objects.STROMKREISABSCHNITT;
@@ -3687,8 +3759,8 @@ class ConverterIntegral7 {
                             (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner) +
                             '-' +
                             (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
-                        const cimrdfid = (0, parser_utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137, this.objectMappingConfig.standardiseUuid);
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(cimrdfid, (0, util_create_1.createNotation)([name, '_' + stk.pos.toString(), '_' + cimrdfid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
+                        const uuid = (0, parser_utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137, this.objectMappingConfig.standardiseUuid);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuid, (0, util_create_1.createNotation)([name, '_' + stk.pos.toString(), '_' + uuid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
                         if (stk.baujahr) {
                             const wire = new EVWireObject_1.EVWireObject(common_utils_1.CommonUtils.generateUUID(), stk.name);
                             wire.type = 'Stromkreisabschnitt';
@@ -3715,6 +3787,9 @@ class ConverterIntegral7 {
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt
                      */
                     const acLineSegmentStart = acLineSegments[0];
+                    if (line.getUUID() === "4637c6dc-fad5-45f1-91e0-091d00717a3b" || line.getUUID() === "a992f3c9-f2e1-4cd6-8cc6-fd3d5d167871") {
+                        const stop = true;
+                    }
                     const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (startTerminal) {
                         //this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentStart, acLineSegmentStart.description, startTerminal);
@@ -3816,7 +3891,7 @@ class ConverterIntegral7 {
                                 }
                             }
                             else {
-                                this.logger.error(`Leitung ${line.getUUID()} with Terminal ${terminal.getUUID()}: ConnectivityNode konnte nicht bestimmt werden.`);
+                                this.logger.error(`Leitung ${line.getUUID()} with Terminal ${terminal.getUUID()}: SubGeographicalRegion konnte nicht bestimmt werden.`);
                             }
                             tmp_terminal = values.next();
                         }
@@ -3838,7 +3913,7 @@ class ConverterIntegral7 {
         });
     }
     convertDCLines(cimModel, integral7, defaultValuesConfig) {
-        var _a;
+        var _a, _b;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             //Workaround: Prefill Integral 7 model hgueAnschlussKnotenIDs because of missing bays and schlaufen for dc objects this data structure keeps empty.
             //for(let dc_node of this.hgueAnschlussKnotenIDs){
@@ -3862,7 +3937,10 @@ class ConverterIntegral7 {
                     let converterTargetNeg = false;
                     let converterUnitTargetSide = false;
                     let bipol = (0, parser_utils_1.convertToBooleanI7)(i7Data.bipol);
-                    bipol = (0, parser_utils_1.convertToBooleanI7)(false);
+                    if (bipol === undefined) {
+                        bipol = false;
+                    }
+                    let dcNode = undefined;
                     //Parameter "guidp" is available for monopolar and bipolar dc systems. Thus create DCLineSegment with positive sign property in any case.
                     const dcLineSegment = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidp, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
                     let dcLineSegmentNeg = undefined;
@@ -3874,7 +3952,7 @@ class ConverterIntegral7 {
                     dcLineSegment.capacitance = undefined;
                     dcLineSegment.inductance = undefined;
                     /**EQ: given directly by the INTEGRAL system model */
-                    dcLineSegment.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (bipol ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) / 2 : (0, parser_utils_1.convertToNumberI7)(i7Data.rdc)) : undefined;
+                    dcLineSegment.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
                     dcLineSegment.equipmentContainer = dcLine;
                     //create second dcLineSegment in case this dcLine is a bipol.
                     if (bipol) {
@@ -3883,34 +3961,42 @@ class ConverterIntegral7 {
                         dcLineSegmentNeg.length = dcLineSegment.length;
                         dcLineSegmentNeg.capacitance = undefined;
                         dcLineSegmentNeg.inductance = undefined;
-                        dcLineSegmentNeg.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (bipol ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) / 2 : (0, parser_utils_1.convertToNumberI7)(i7Data.rdc)) : undefined;
+                        dcLineSegmentNeg.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
                         dcLineSegmentNeg.equipmentContainer = dcLineNeg;
                     }
                     const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) : undefined;
                     converterStart = (0, parser_utils_1.convertToBooleanI7)(acDCConverterStart !== undefined);
                     let acDCConverterStartNeg = undefined;
                     const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) : undefined;
-                    converterStart = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTarget !== undefined);
+                    converterTarget = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTarget !== undefined);
                     let acDCConverterTargetNeg = undefined;
+                    if (acDCConverterTarget === undefined) {
+                        const stop = true;
+                    }
+                    else if (acDCConverterStart === undefined) {
+                        const stop = true;
+                    }
+                    const int7hguekopfStart = converterStart ? (_a = integral7.integralHgueKopf) === null || _a === void 0 ? void 0 : _a.get(this.UUID2Integral7ID.get(acDCConverterStart.getUUID()).find(elem => elem)) : undefined;
+                    const int7hguekopfTarget = converterTarget ? (_b = integral7.integralHgueKopf) === null || _b === void 0 ? void 0 : _b.get(this.UUID2Integral7ID.get(acDCConverterTarget.getUUID()).find(elem => elem)) : undefined;
                     //Setting acDCConverterStartNeg and acDCConverterTargetNeg in case this DCLine is a bipol
                     if (bipol) {
-                        const int7hguekopf = converterStart ? (_a = integral7.integralHgueKopf) === null || _a === void 0 ? void 0 : _a.get(this.UUID2Integral7ID.get(acDCConverterStart.getUUID()).find(elem => elem)) : undefined;
-                        acDCConverterStartNeg = converterStart && int7hguekopf !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopf, acDCConverterStart.constructor.name, acDCConverterStart) : undefined;
+                        acDCConverterStartNeg = converterStart && int7hguekopfStart !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopfStart, acDCConverterStart.constructor.name, acDCConverterStart) : undefined;
                         converterStartNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterStartNeg !== undefined);
-                        acDCConverterTargetNeg = converterTarget && int7hguekopf !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopf, acDCConverterTarget.constructor.name, acDCConverterTarget) : undefined;
+                        acDCConverterTargetNeg = converterTarget && int7hguekopfTarget !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopfTarget, acDCConverterTarget.constructor.name, acDCConverterTarget) : undefined;
                         converterTargetNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTargetNeg !== undefined);
                     }
+                    //Set grounding for dcConverterUnit
+                    const converterUnitStart = (acDCConverterStart === null || acDCConverterStart === void 0 ? void 0 : acDCConverterStart.equipmentContainer) ? acDCConverterStart.equipmentContainer : undefined;
+                    converterUnitStartSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitStart !== undefined);
+                    const converterUnitTarget = (acDCConverterTarget === null || acDCConverterTarget === void 0 ? void 0 : acDCConverterTarget.equipmentContainer) ? acDCConverterTarget.equipmentContainer : undefined;
+                    converterUnitTargetSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitTarget !== undefined);
                     if (converterStart && !converterStartNeg) {
-                        createDCGround(acDCConverterStart);
+                        dcNode = createDCGround(cimModel, acDCConverterStart, int7hguekopfStart);
                     }
                     else if (converterStart && converterStartNeg) {
-                        createDCGround(acDCConverterStart);
-                        connectDCGround(acDCConverterStartNeg);
+                        dcNode = createDCGround(cimModel, acDCConverterStart, int7hguekopfStart);
+                        connectDCGround(cimModel, acDCConverterStartNeg, int7hguekopfStart, dcNode, DCPolarityKind_1.DCPolarityKind.middle);
                     }
-                    const converterUnitStart = acDCConverterStart.equipmentContainer ? acDCConverterStart.equipmentContainer : undefined;
-                    converterUnitStartSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitStart !== undefined);
-                    const converterUnitTarget = acDCConverterTarget.equipmentContainer ? acDCConverterTarget.equipmentContainer : undefined;
-                    converterUnitTargetSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitTarget !== undefined);
                     switch (bipol) {
                         case true: {
                             if (converterUnitStartSide && !converterUnitTargetSide) {
@@ -3921,11 +4007,11 @@ class ConverterIntegral7 {
                                 converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
                                 converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
                                 if (converterTarget && !converterTargetNeg) {
-                                    createDCGround(acDCConverterTarget);
+                                    dcNode = createDCGround(cimModel, acDCConverterTarget, int7hguekopfTarget);
                                 }
                                 else if (converterTarget && converterTargetNeg) {
-                                    createDCGround(acDCConverterTarget);
-                                    connectDCGround(acDCConverterTargetNeg);
+                                    dcNode = createDCGround(cimModel, acDCConverterTarget, int7hguekopfTarget);
+                                    connectDCGround(cimModel, acDCConverterTargetNeg, int7hguekopfTarget, dcNode, DCPolarityKind_1.DCPolarityKind.middle);
                                 }
                                 else {
                                     this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r ACDCConverter konnte nicht ermittelt werden.`);
@@ -3939,27 +4025,29 @@ class ConverterIntegral7 {
                         case false: {
                             if (converterUnitStartSide && !converterUnitTargetSide) {
                                 converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
-                                converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
-                                createNeutralGroundReturn(converterUnitStart, converterUnitTarget);
                                 this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r DCConverterUnit am Leitungsende konnte nicht ermittelt werden.`);
                             }
                             else if (converterUnitStartSide && converterUnitTargetSide) {
                                 converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
+                                converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
+                                createDCGround(cimModel, acDCConverterTarget, int7hguekopfTarget);
                             }
+                            break;
                         }
                         default: {
-                            this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: die bipol-Eigenschaft ist nicht gesetzt.`);
+                            this.logger.info(`info --- HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: die bipol-Eigenschaft ist nicht gesetzt.`);
                         }
                     }
                     // Topologie DC
                     /* Anfang / Ende DCNodes*/
-                    const startDCNode = acDCConverterStart ? getDCNodeFromConverter(acDCConverterStart) : undefined;
-                    const startDCNodeNeg = acDCConverterStartNeg ? getDCNodeFromConverter(acDCConverterStartNeg) : undefined;
+                    let startDCNode = converterStart ? getDCNodeFromConverter(acDCConverterStart, DCPolarityKind_1.DCPolarityKind.positive) : undefined;
+                    const startDCNodeNeg = converterStartNeg ? getDCNodeFromConverter(acDCConverterStartNeg, DCPolarityKind_1.DCPolarityKind.negative) : undefined;
                     if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)('i7Data.guid_dcterminalp', this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
-                        dcTerminal.connected = true;
+                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminalp1'), this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
                         dcTerminal.dCConductingEquipment = dcLineSegment;
+                        dcTerminal.connected = true;
                         dcTerminal.dcNode = startDCNode;
+                        dcLineSegment.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         startDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         cimModel.addDCTerminal(dcTerminal);
                     }
@@ -3967,23 +4055,23 @@ class ConverterIntegral7 {
                         this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
                     }
                     if (startDCNodeNeg) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)('i7Data.guid_dcterminaln'), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
-                        dcTerminal.connected = true;
+                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminaln1')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
                         dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
                         dcTerminal.dcNode = startDCNodeNeg;
+                        dcLineSegmentNeg.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         startDCNodeNeg.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         cimModel.addDCTerminal(dcTerminal);
                     }
                     else {
                         this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Anfangsknoten NEG. ${i7Data.anetzobjekt} ${this.integralID2UUID.get(i7Data.anetzobjekt)}`);
                     }
-                    const targetDCNode = acDCConverterTarget ? getDCNodeFromConverter(acDCConverterTarget) : undefined;
-                    const targetDCNodeNeg = acDCConverterTargetNeg ? getDCNodeFromConverter(acDCConverterTargetNeg) : undefined;
+                    const targetDCNode = converterTarget ? getDCNodeFromConverter(acDCConverterTarget, DCPolarityKind_1.DCPolarityKind.positive) : undefined;
+                    const targetDCNodeNeg = converterTargetNeg ? getDCNodeFromConverter(acDCConverterTargetNeg, DCPolarityKind_1.DCPolarityKind.negative) : undefined;
                     if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
-                        dcTerminal.connected = true;
+                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminalp2')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = targetDCNode;
+                        dcLineSegment.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         targetDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         cimModel.addDCTerminal(dcTerminal);
                     }
@@ -3991,10 +4079,10 @@ class ConverterIntegral7 {
                         this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
                     }
                     if (targetDCNodeNeg) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
-                        dcTerminal.connected = true;
+                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminaln2')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
                         dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
                         dcTerminal.dcNode = targetDCNodeNeg;
+                        dcLineSegmentNeg.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         targetDCNodeNeg.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
                         cimModel.addDCTerminal(dcTerminal);
                     }
@@ -4003,7 +4091,7 @@ class ConverterIntegral7 {
                     }
                     cimModel.addDCLine(dcLine);
                     cimModel.addDCLineSegment(dcLineSegment);
-                    if (bipol) {
+                    if (bipol && dcLineNeg && dcLineSegmentNeg) {
                         cimModel.addDCLine(dcLineNeg);
                         cimModel.addDCLineSegment(dcLineSegmentNeg);
                     }
@@ -4179,8 +4267,11 @@ class ConverterIntegral7 {
                     }
                 }
                 for (const i7Data of result) {
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    if (uuid === "02b17e6c-eeed-451e-a822-c54e6d6c4db1") {
+                        const stop = true;
+                    }
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const facility = util_asset_model_1.UtilAssetModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer);
                     /** AssetInfos */
                     if (i7Data.baujahr) {
@@ -4238,9 +4329,7 @@ class ConverterIntegral7 {
                     const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '');
                     const sr = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
                     const ur = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
-                    //const x0 = get
-                    // I rated
-                    const ir1 = (0, utils_2.getTrafoIr)(ur, sr);
+                    const sdauer = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer) : sr;
                     // P0 Lastverluste im I7 Modell p_leer
                     const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
                     // Leerlaufverluste
@@ -4269,7 +4358,7 @@ class ConverterIntegral7 {
                             const startTerminal = start ? this.createConnection(cimModel, powerTransformer, start, PhaseCode.ABC, true, 1) : undefined;*/
                     if (!startTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, startTerminal, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, startTerminal, sternpunktKnotenMap, integral7, sdauer, i7Data, defaultValuesConfig);
                     /**Add boundary equivalent injection if terminal is connected to boudary point. */
                     let equivalentInjection = undefined;
                     if (startTerminal) {
@@ -4295,14 +4384,12 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
                     powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
                     powerTransformerEnd2.r0 = zeroSequImpedanzWx.r02;
-                    // I rated
-                    const ir2 = (sr * Math.pow(10, 6) / ur2 * 1000) / Math.sqrt(3);
                     /*       const ziel = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
                            const zielTerminal = ziel ? this.createConnection(cimModel, powerTransformer, ziel, PhaseCode.ABC, true, 2) : undefined;*/
                     const zielTerminal = this.createBoundaryConnection(frame, powerTransformer, i7Data.eknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!zielTerminal)
                         this.logger.debug(`PowerTransformer2W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Zielknoten.`);
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, zielTerminal, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, zielTerminal, sternpunktKnotenMap, integral7, undefined, i7Data, defaultValuesConfig);
                     /**Add boundary equivalent injection if terminal is connected to boudary point. */
                     if (zielTerminal) {
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
@@ -4391,8 +4478,15 @@ class ConverterIntegral7 {
                 }
                 for (const i7Data of result) {
                     const sternpunktKnotenMap = new Map();
-                    const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const uuid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
+                    const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
+                    if (substation) {
+                        powerTransformer.equipmentContainer = substation;
+                    }
+                    else {
+                        this.logger.debug(`Trafo3W ${i7Data.id} besitzt keine Umspannanlage.`);
+                    }
                     const facility = util_asset_model_1.UtilAssetModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer);
                     /** AssetInfos */
                     if (i7Data.baujahr) {
@@ -4403,13 +4497,6 @@ class ConverterIntegral7 {
                         facility.setAssetInfo(powerTransformerInfo);
                         powerTransformerInfo.addAsset(facility);
                     }
-                    const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
-                    if (substation) {
-                        powerTransformer.equipmentContainer = substation;
-                    }
-                    else {
-                        this.logger.debug(`Trafo3W ${i7Data.id} besitzt keine Umspannanlage.`);
-                    }
                     const schaltgruppe = i7Data.schaltgr;
                     //Set property 'isPartOfGeneratorUnit' to 'true' if property 'Blocktransformator' is set in Integral data.
                     if (this.blocktransformatoren.includes((0, parser_utils_1.convertToNumberI7)(i7Data.id))) {
@@ -4439,10 +4526,9 @@ class ConverterIntegral7 {
                     const ur1 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 1);
                     const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 2);
                     const ur3 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 3);
-                    // I rated: power in MVA, ur in kV
-                    const ir1 = sr1 * Math.pow(10, 6) / ((ur1 * Math.pow(10, 3)) * Math.sqrt(3));
-                    const ir2 = sr2 * Math.pow(10, 6) / ((ur2 * Math.pow(10, 3)) * Math.sqrt(3));
-                    const ir3 = sr3 * Math.pow(10, 6) / ((ur3 * Math.pow(10, 3)) * Math.sqrt(3));
+                    const sdauer1 = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer_1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer_1) : sr1;
+                    const sdauer2 = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer_2) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer_2) : sr2;
+                    const sdauer3 = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer_3) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer_3) : sr3;
                     //Leerlaufverluste in kW
                     const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
                     // Leerlaufstrom bezogen auf Wicklung mit dem grössten Sr in %
@@ -4495,7 +4581,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
                     powerTransformerEnd1.ratedU = ur1;
                     powerTransformerEnd1.ratedS = sr1;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig, trafoWicklungen);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, sdauer1, i7Data, defaultValuesConfig, trafoWicklungen);
                     /**Add boundary equivalent injection if terminal is connected to boudary point. */
                     let equivalentInjection = undefined;
                     if (terminal1) {
@@ -4505,6 +4591,9 @@ class ConverterIntegral7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
+                    if (powerTransformer.mrid === "49afe40b-89cc-419f-afc5-f330c6589f82") {
+                        const stop = true;
+                    }
                     //set transformer end winding connection
                     powerTransformerEnd1.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
                     powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
@@ -4545,7 +4634,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     powerTransformerEnd2.powerTransformer = powerTransformer;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, terminal2, sternpunktKnotenMap, integral7, ir2, i7Data, defaultValuesConfig, trafoWicklungen);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd2, powerTransformer, terminal2, sternpunktKnotenMap, integral7, sdauer2, i7Data, defaultValuesConfig, trafoWicklungen);
                     /**Add boundary equivalent injection if terminal is connected to boudary point. */
                     equivalentInjection = undefined;
                     if (terminal2) {
@@ -4595,7 +4684,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     powerTransformerEnd3.powerTransformer = powerTransformer;
-                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd3, powerTransformer, terminal3, sternpunktKnotenMap, integral7, ir3, i7Data, defaultValuesConfig, trafoWicklungen);
+                    this.setPowerTransformerEndProperties(frame, powerTransformerEnd3, powerTransformer, terminal3, sternpunktKnotenMap, integral7, sdauer3, i7Data, defaultValuesConfig, trafoWicklungen);
                     /**Add boundary equivalent injection if terminal is connected to boudary point. */
                     equivalentInjection = undefined;
                     if (terminal3) {
@@ -4748,60 +4837,6 @@ class ConverterIntegral7 {
                     equipment.equipmentContainer = undefined;
                     cimModel.removeObject(equipment);
                 }
-                /** ConnectivityNodes */
-                /** Change EquipmentContainer from Substation/VoltageLevel to Line */
-                /*      const location = substation.location;
-                      for (let i = 0; i < connectivityNodes.length; i++) {
-                        const connectivityNode = connectivityNodes[i];
-                        connectivityNode.connectivityNodeContainer = line;
-                        line.addConnectivityNode(connectivityNode);
-                        /!** Junction *!/
-                          //TODO ggfs. mit Grenzknoten verbinden
-                        const junction = new Junction(generateUUID(), `${line.name} BD_Junc`, `Junction`, 'Junction for Geo');
-                        junction.equipmentContainer = line;
-                
-                        /!**
-                         * Junction class is included in the boundary for the purpose of GeographicalLocation profile and
-                         * for special representation of the boundary points (Xnodes).
-                         * The Terminal of the Junction is included in the EQ instance file.
-                         * The Junction is contained in the same Line as the ConnectivityNode is contained.
-                         * *!/
-                        const terminal = new Terminal(generateUUID(),'boundary_junction_label', 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
-                        terminal.conductingEquipment = junction;
-                        terminal.connectivityNode = connectivityNode;
-                        junction.terminals.set(terminal.getUUID(), terminal);
-                        masFrame.cimModel.addTerminal(terminal);
-                        // MAS GL Profil BD Modell Abhängigkeit hinzufügen
-                        masFrame.addDependentModel(RDF_XML.PROFILE_EQ_BD, frame.getModelUUID(RDF_XML.PROFILE_EQ_BD));
-                        /!** Geokoordinaten *!/
-                        /!** Die Geokoordinaten der UA wird auf die Junction des ConnectivityNodes übertragen*!/
-                        if (location) {
-                          const clonedLocation = new Location(generateUUID(), `Location ${i + 1}`);
-                          clonedLocation.addPowerSystemResource(junction);
-                          clonedLocation.coordinateSystem = location.coordinateSystem;
-                          const clonedPositionPoint = new PositionPoint(generateUUID(), `PositionPoint ${i + 1}`);
-                          /!** Lan Länge *!/ //Take first position point found for this location.
-                          clonedPositionPoint.xPosition = location.positionPoints[0].xPosition;
-                          /!** Lat Breite *!/
-                          clonedPositionPoint.yPosition = location.positionPoints[0].yPosition;
-                
-                          clonedPositionPoint.location = clonedLocation;
-                          clonedLocation.addPositionPoint(clonedPositionPoint);
-                          masFrame.cimModel.addLocation(clonedLocation);
-                        }
-                
-                        line.addEquipment(junction);
-                        cimModel.addJunction(junction);
-                      }
-                      // Location bereinigen
-                      cimModel.locations.delete(location.mrid);
-                      cimModel.removeObject(location);
-                      for (const positionPoint of location.positionPoints) {
-                        const idx = cimModel.positionPoints.indexOf(positionPoint);
-                        if (idx > -1) {
-                          cimModel.positionPoints.splice(idx, 1);
-                        }
-                      }*/
                 /** Geokoordinaten */
                 const location = substation.location;
                 for (let i = 0; i < connectivityNodes.length; i++) {
@@ -4821,8 +4856,7 @@ class ConverterIntegral7 {
                     let terminal = new Terminal_1.Terminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([line.getUUID().substring(0, 8), '_BD-JCT-T']), 'bd_jct_lab', 'terminal to connect junction to associated boundary ConnectivityNode', 1);
                     junction.terminals.set(terminal.getUUID(), terminal);
                     terminal.conductingEquipment = junction;
-                    // TODO ist nicht notwendig
-                    // terminal.connectivityNode = connectivityNode;
+                    terminal.connectivityNode = connectivityNode;
                     line.addEquipment(junction);
                     /** Die Geokoordinaten der UA wird auf die Junction des ConnectivityNodes übertragen */
                     if (location && location.positionPoints.length) {
@@ -4899,11 +4933,12 @@ class ConverterIntegral7 {
             data.laenge = 1;
         }
         // Laenge: If valid data.laenge is given then assign it to parameter length, else set parameter length to zero. REMARK: CGMES Standard 2.x.y defines that a cim:ACLineSegment with no impedance has length of zero and arbitrary r, x, b, g etc.
-        if ((0, parser_utils_1.isNumericI7)(data.laenge) && data.laenge > 0 /*&& !data.flag_impedanzlos*/) {
+        if ((0, parser_utils_1.isNumericI7)(data.laenge) && data.laenge > 0 && !data.flag_impedanzlos) {
             acLineSegment.length = data.laenge;
-        } /* else {
-          acLineSegment.length = 1;
-        }*/
+        }
+        else {
+            acLineSegment.length = 1;
+        }
         const assetType = defaultModel.getWireInfoByName(data.nametyp);
         // r0
         if ((0, parser_utils_1.isNumericI7)(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
@@ -4977,48 +5012,89 @@ class ConverterIntegral7 {
         }
         // ir
         for (const terminal of acLineSegment.terminals.values()) {
-            if ((0, parser_utils_1.isNumericI7)(data.ir) && data.ir > 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, data.ir);
-            }
-            else if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
-                this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
-            }
+            const ir = (0, parser_utils_1.isNumericI7)(data.ir) ? (0, parser_utils_1.convertToNumberI7)(data.ir) : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.ratedCurrent) ? (0, parser_utils_1.convertToNumberI7)(assetType.ratedCurrent) : undefined);
+            const igrenz = (0, parser_utils_1.isNumericI7)(data.igrenz) ? (0, parser_utils_1.convertToNumberI7)(data.igrenz) : ((0, parser_utils_1.isNumericI7)(assetType === null || assetType === void 0 ? void 0 : assetType.limitingCurrent) ? (0, parser_utils_1.convertToNumberI7)(assetType.limitingCurrent) : undefined);
+            this.setConductingEquipmentOperationalLimit(cimModel, acLineSegment.name, terminal, ir, new CurrentLimit_1.CurrentLimit(common_utils_1.CommonUtils.generateUUID(), acLineSegment.name), igrenz);
             //PSRType
             const psrType = (0, utils_1.createIfNotExitsPSRType)(cimModel, data.typ);
             acLineSegment.psrTypeUUID = psrType.mrid;
-            // psrType.addPowerSystemResource(acLineSegment);
         }
     }
-    setConductingEquipmentCurrentLimit(cimModel, name, terminal, ir) {
-        const currentLimit = new CurrentLimit_1.CurrentLimit(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-        cimModel.addCurrentLimit(currentLimit);
-        currentLimit.value = new CurrentFlow_1.CurrentFlow(ir, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
-        const operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-        cimModel.addOperationalLimitSet(operationalLimitSet);
-        operationalLimitSet.addOperationalLimit(currentLimit);
-        currentLimit.operationalLimitSet = operationalLimitSet;
-        const operationalLimitType = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
-        operationalLimitType.addOperationalLimit(currentLimit);
-        currentLimit.operationalLimitType = operationalLimitType;
-        operationalLimitSet.terminal = terminal;
-    }
-    setVoltageLimit(cimModel, name, terminal, voltage, type, direction) {
-        const voltageLimit = new VoltageLimit_1.VoltageLimit(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-        cimModel.addVoltageLimit(voltageLimit);
-        voltageLimit.value = voltage;
-        const operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
-        cimModel.addOperationalLimitSet(operationalLimitSet);
-        operationalLimitSet.addOperationalLimit(voltageLimit);
-        voltageLimit.operationalLimitSet = operationalLimitSet;
-        const operationalLimitType = this.createIfNotExistOperationalLimitType(cimModel, name, type, direction);
-        operationalLimitType.addOperationalLimit(voltageLimit);
-        voltageLimit.operationalLimitType = operationalLimitType;
-        operationalLimitSet.terminal = terminal;
-    }
-    setACLineSegmentCurrentLimt(cimModel, acLineSegment, nametyp, terminal) {
-        const assetType = this.cimModelDefault.getWireInfoByName(nametyp);
-        if (assetType && assetType.ratedCurrent && assetType.ratedCurrent !== 0) {
-            this.setConductingEquipmentCurrentLimit(cimModel, acLineSegment.name, terminal, assetType.ratedCurrent);
+    setConductingEquipmentOperationalLimit(cimModel, name, terminal, physLimit, limit, igrenz) {
+        let operationalLimitSet = undefined;
+        let operationalLimitTypePatl = undefined;
+        if (limit instanceof CurrentLimit_1.CurrentLimit) {
+            //mandatory for aclinesegments and powertransformers
+            const ir = physLimit;
+            let currentLimitTatl = undefined;
+            let currentLimitPatl = undefined;
+            let operationalLimitTypeTatl = undefined;
+            if (ir) {
+                currentLimitPatl = limit;
+                currentLimitPatl.value = new CurrentFlow_1.CurrentFlow(ir, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
+                cimModel.addCurrentLimit(currentLimitPatl);
+            }
+            //optional
+            if (igrenz) {
+                currentLimitTatl = new CurrentLimit_1.CurrentLimit(common_utils_1.CommonUtils.generateUUID(), `${name}`);
+                currentLimitTatl.value = new CurrentFlow_1.CurrentFlow(igrenz, UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.A);
+                cimModel.addCurrentLimit(currentLimitTatl);
+            }
+            if (currentLimitPatl && currentLimitTatl) {
+                operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
+                cimModel.addOperationalLimitSet(operationalLimitSet);
+                operationalLimitSet.addOperationalLimit(currentLimitPatl);
+                currentLimitPatl.operationalLimitSet = operationalLimitSet;
+                operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                operationalLimitTypePatl.addOperationalLimit(currentLimitPatl);
+                currentLimitPatl.operationalLimitType = operationalLimitTypePatl;
+                operationalLimitSet.terminal = terminal;
+                operationalLimitSet.addOperationalLimit(currentLimitTatl);
+                currentLimitTatl.operationalLimitSet = operationalLimitSet;
+                operationalLimitTypeTatl = this.createIfNotExistOperationalLimitType(cimModel, 'tatl', LimitTypeKind_1.LimitTypeKind.tatl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                operationalLimitTypeTatl.addOperationalLimit(currentLimitTatl);
+                currentLimitTatl.operationalLimitType = operationalLimitTypeTatl;
+            }
+            else if (currentLimitPatl) {
+                operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
+                cimModel.addOperationalLimitSet(operationalLimitSet);
+                operationalLimitSet.addOperationalLimit(currentLimitPatl);
+                currentLimitPatl.operationalLimitSet = operationalLimitSet;
+                operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                operationalLimitTypePatl.addOperationalLimit(currentLimitPatl);
+                currentLimitPatl.operationalLimitType = operationalLimitTypePatl;
+                operationalLimitSet.terminal = terminal;
+            }
+            else if (currentLimitTatl) {
+                operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
+                cimModel.addOperationalLimitSet(operationalLimitSet);
+                operationalLimitSet.addOperationalLimit(currentLimitTatl);
+                currentLimitTatl.operationalLimitSet = operationalLimitSet;
+                operationalLimitTypeTatl = this.createIfNotExistOperationalLimitType(cimModel, 'tatl', LimitTypeKind_1.LimitTypeKind.tatl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                operationalLimitTypeTatl.addOperationalLimit(currentLimitTatl);
+                currentLimitTatl.operationalLimitType = operationalLimitTypeTatl;
+                operationalLimitSet.terminal = terminal;
+            }
+        }
+        else if (limit instanceof ApparentPowerLimit_1.ApparentPowerLimit) {
+            let apparentPowerLimit = undefined;
+            if (physLimit != undefined) {
+                apparentPowerLimit = limit;
+                apparentPowerLimit.uuid = common_utils_1.CommonUtils.generateUUID();
+                apparentPowerLimit.name = `${name}`;
+                cimModel.addCurrentLimit(apparentPowerLimit);
+                apparentPowerLimit.value = new ApparentPower_1.ApparentPower(physLimit, UnitMultiplier_1.UnitMultiplier.M, UnitSymbol_1.UnitSymbol.VA);
+                if (apparentPowerLimit) {
+                    operationalLimitSet = new OperationalLimitSet_1.OperationalLimitSet(common_utils_1.CommonUtils.generateUUID(), `${name}`);
+                    cimModel.addOperationalLimitSet(operationalLimitSet);
+                    operationalLimitSet.addOperationalLimit(apparentPowerLimit);
+                    apparentPowerLimit.operationalLimitSet = operationalLimitSet;
+                    operationalLimitTypePatl = this.createIfNotExistOperationalLimitType(cimModel, 'patl', LimitTypeKind_1.LimitTypeKind.patl, OperationalLimitDirectionKind_1.OperationalLimitDirectionKind.absoluteValue);
+                    operationalLimitTypePatl.addOperationalLimit(apparentPowerLimit);
+                    apparentPowerLimit.operationalLimitType = operationalLimitTypePatl;
+                    operationalLimitSet.terminal = terminal;
+                }
+            }
         }
     }
     createIfNotExistOperationalLimitType(cimModel, name, type, direction) {
@@ -5050,7 +5126,10 @@ class ConverterIntegral7 {
             terminal.phases = phase;
             terminal.conductingEquipment = conductingEquipment;
             conductingEquipment.addTerminal(terminal);
-            terminal.connected = connected;
+            terminal.connected = (terminal.connected !== undefined) ? terminal.connected : connected;
+            if (terminal.connected === false) {
+                const stop = true;
+            }
             if (!isNameSet) {
                 terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
             }
@@ -5060,7 +5139,7 @@ class ConverterIntegral7 {
     createBoundaryConnection(frame, conductingEquipment, i7ObjectID, phase) {
         const cimModel = frame.cimModel;
         const anschlussUUID = this.integralID2UUID.get(i7ObjectID);
-        let terminal;
+        let terminal = undefined;
         let cn = undefined;
         if (cimModel.objects.has(anschlussUUID)) {
             // Anschluss befindet sich im selben Modell
@@ -5114,7 +5193,7 @@ class ConverterIntegral7 {
                     this.annotateBoundaryNode(frame.name, frame.isoCode, frame.tsoName, cn);
                 }
                 else {
-                    this.logger.error(`Für das Objekt ${conductingEquipment.constructor.name} ${conductingEquipment.getUUID()} konnte am I7-Objekt ${i7ObjectID} kein Grenz ConnenctivityNode bestimmt werden`);
+                    this.logger.error(`error --- Für das Objekt ${conductingEquipment.constructor.name} ${conductingEquipment.getUUID()} / ${conductingEquipment.equipmentContainer.constructor.name} ${conductingEquipment.equipmentContainer.getUUID()} konnte am I7-Objekt ${i7ObjectID} kein Grenzknoten bestimmt werden`);
                 }
                 if (terminal) {
                     terminal.conductingEquipment = conductingEquipment;
@@ -5122,7 +5201,7 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.error(`Für das Objekt ${conductingEquipment.constructor.name} ${conductingEquipment.getUUID()} konnte am I7-Objekt ${i7ObjectID} kein Grenzknoten bestimmt werden`);
+                this.logger.error(`error --- Für das Objekt ${conductingEquipment.constructor.name} ${conductingEquipment.getUUID()} / ${conductingEquipment.equipmentContainer.constructor.name} ${conductingEquipment.equipmentContainer.getUUID()} konnte am I7-Objekt ${i7ObjectID} kein Anschlusspunkt bestimmt werden`);
             }
         }
         return terminal;
@@ -5221,6 +5300,7 @@ class ConverterIntegral7 {
     getSpannungsbandTrafo(i7Data, powerTransformerEnds) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                var _a, _b, _c;
                 let minMaxSollResult;
                 // Spannungsgeregelter Anschluss
                 /**
@@ -5229,9 +5309,18 @@ class ConverterIntegral7 {
                  * 2 - Niederspannungsseite (Anschluss 3)
                  * 3 - Externer Knoten
                  * */
-                let tempKnotenId = i7Data.spgreg_anschluss === 0 ? this.UUID2Integral7ID.get(powerTransformerEnds[0].getTerminal().getConnectivityNodeUUID())[0] : undefined;
-                tempKnotenId = i7Data.spgreg_anschluss === 1 ? this.UUID2Integral7ID.get(powerTransformerEnds[1].getTerminal().getConnectivityNodeUUID())[0] : tempKnotenId;
-                tempKnotenId = i7Data.spgreg_anschluss === 2 ? this.UUID2Integral7ID.get(powerTransformerEnds[2].getTerminal().getConnectivityNodeUUID())[0] : tempKnotenId;
+                if (powerTransformerEnds[0] && powerTransformerEnds[0].getTerminal() === undefined) {
+                    const stop = true;
+                }
+                if (powerTransformerEnds[1] && powerTransformerEnds[1].getTerminal() === undefined) {
+                    const stop = true;
+                }
+                if (powerTransformerEnds[2] && powerTransformerEnds[2].getTerminal() === undefined) {
+                    const stop = true;
+                }
+                let tempKnotenId = i7Data.spgreg_anschluss === 0 ? this.UUID2Integral7ID.get((_a = powerTransformerEnds[0].getTerminal()) === null || _a === void 0 ? void 0 : _a.getConnectivityNodeUUID())[0] : undefined;
+                tempKnotenId = i7Data.spgreg_anschluss === 1 ? this.UUID2Integral7ID.get((_b = powerTransformerEnds[1].getTerminal()) === null || _b === void 0 ? void 0 : _b.getConnectivityNodeUUID())[0] : tempKnotenId;
+                tempKnotenId = i7Data.spgreg_anschluss === 2 ? this.UUID2Integral7ID.get((_c = powerTransformerEnds[2].getTerminal()) === null || _c === void 0 ? void 0 : _c.getConnectivityNodeUUID())[0] : tempKnotenId;
                 tempKnotenId = i7Data.spgreg_anschluss === 3 ? (i7Data.spgreg_knoten !== undefined ? i7Data.spgreg_knoten : undefined) : tempKnotenId;
                 if (i7Data.spgreg_anschluss >= 0 && i7Data.spgreg_anschluss <= 2 && tempKnotenId !== undefined) { // Lokale Regelung
                     // Falls tempKnotenId ausgeprägt ist, bestimme in welcher Tabelle der aKnoten bzw. eKnoten enthalten ist.
@@ -5551,14 +5640,14 @@ class ConverterIntegral7 {
         coordinateSystem.crsUrn = crsUrn;
         cimModel.addCoordinateSystem(coordinateSystem);
     }
-    setPowerTransformerEndProperties(frame, powerTransformerEnd, powerTransformer, terminal, sternpunktKnotenMap, integral7, ir, i7Data, defaultValuesConfig, windings) {
+    setPowerTransformerEndProperties(frame, powerTransformerEnd, powerTransformer, terminal, sternpunktKnotenMap, integral7, sdauer, i7Data, defaultValuesConfig, windings) {
         var _a, _b;
         const cimModel = frame.cimModel;
         if (terminal) {
             // Topologie
             powerTransformerEnd.terminal = terminal;
-            // CurrentLimit
-            this.setConductingEquipmentCurrentLimit(cimModel, `W${powerTransformerEnd.endNumber}` + (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name), terminal, ir);
+            // ApparentPowerLimit
+            this.setConductingEquipmentOperationalLimit(cimModel, `W${powerTransformerEnd.endNumber}` + (powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name), terminal, sdauer, new ApparentPowerLimit_1.ApparentPowerLimit());
             let isTrafo2w = i7Data.trafowicklung3w3 === undefined ? true : false;
             // Erdung / Sternpunkt
             if (sternpunktKnotenMap.has(i7Data.id) && isTrafo2w) {
@@ -5612,25 +5701,25 @@ class ConverterIntegral7 {
     }
     convertTapChangers(i7Data, transformerEnds, cimModel, transformerinfo, connectivityNode, spannungsband) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        /*if(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid) === '11e7be86-8bb7-41ba-898a-74cd5e8efbb9'){ //Zeile50
+        /*if(getUUID(i7Data.guid) === '11e7be86-8bb7-41ba-898a-74cd5e8efbb9'){ //Zeile50
           let stop = true; DONE
         }
-        if(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid) === '1239F03C-ED5B-4FDF-9453-D97E611FCC36'){ //Zeile52 - Datenfehler: Transformatoren mit definierter Zusatzspannung und Stufungsbereich, jedoch 'Stufensteller nicht vorhanden'
+        if(getUUID(i7Data.guid) === '1239F03C-ED5B-4FDF-9453-D97E611FCC36'){ //Zeile52 - Datenfehler: Transformatoren mit definierter Zusatzspannung und Stufungsbereich, jedoch 'Stufensteller nicht vorhanden'
           let stop = true; DONE
         }*/
-        /*if(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid)=== 'CFDAA56A-A0DA-4C5B-92CC-21138B6D6D07'){ //Standard LR
+        /*if(getUUID(i7Data.guid)=== 'CFDAA56A-A0DA-4C5B-92CC-21138B6D6D07'){ //Standard LR
           let stop = true;
         }*/
-        if ((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid) === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') { //Zeile53 - Typ Meeden'
+        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') { //Zeile53 - Typ Meeden'
             let stop = true;
         }
-        /*if(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid) === '012416f2d9584971baa93360fcf40be2'){ //Zeile55 - SR statt LR'
+        /*if(getUUID(i7Data.guid) === '012416f2d9584971baa93360fcf40be2'){ //Zeile55 - SR statt LR'
           let stop = true;
         }*/
-        if ((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid) === '515508dc-5982-4686-ad26-08d39db91421') { //Zeile81 - SR statt LR'
+        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '515508dc-5982-4686-ad26-08d39db91421') { //Zeile81 - SR statt LR'
             let stop = true;
         }
-        /*if(getUUID(i7Data.guid, this.objectMappingConfig.standardiseUuid) === '5ec82d14-ee64-43b6-86ff-c7615d96f7ad'){ //Zeile58
+        /*if(getUUID(i7Data.guid) === '5ec82d14-ee64-43b6-86ff-c7615d96f7ad'){ //Zeile58
           let stop = true;
         }*/
         let ratioPhaseTapChangerPresent = false;
@@ -5708,21 +5797,23 @@ class ConverterIntegral7 {
             const spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
             //const neutralU = transformerEnd.ratedU;
             let tapChanger = undefined;
-            if ((0, parser_utils_1.isNumericI7)(angle) && (0, parser_utils_1.convertToNumberI7)(angle) % 180 !== 0 || spezialRegelung) {
-                // Winkel ist definiert =>PST/Queregler/PhaseTapChanger
+            let invert = undefined;
+            if ((0, parser_utils_1.isNumericI7)(angle) && (0, parser_utils_1.convertToNumberI7)(angle) % 180 !== 0 || spezialRegelung === 1 || spezialRegelung === 2) {
+                //angle is given and angle%180===0 or angle is not given but spezialRegelung, thus => PhaseTapChanger ("Querregler" oder "Schrägregler")
                 tapChanger = this.createPhaseTapChanger(i7Data, transformerEnds, cimModel, gestufteSeite, entryI7, transformerinfo);
             }
             else {
-                // Winkel ist nicht definiert => Längsregler/RatioTapChanger
+                //invert sign if tapChanger angle%180===0 && angle%360!==0
+                invert = Math.trunc((0, parser_utils_1.convertToNumberI7)(angle) / 180) % 2 === 0 ? 1 : -1;
                 tapChanger = this.createRatioTapChanger(i7Data, transformerEnds, cimModel, connectivityNode, gestufteSeite, entryI7, spannungsband, transformerinfo);
             }
             // Stufen
-            this.setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, entryI7, ratioPhaseTapChangerPresent, tapChangerInfo);
+            this.setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, entryI7, ratioPhaseTapChangerPresent, invert, tapChangerInfo);
             let stop = true;
         }
         let stop = true;
     }
-    setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, ratioPhaseTapChangerPresent, tapChangerInfo) {
+    setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, ratioPhaseTapChangerPresent, invert, tapChangerInfo) {
         var _a;
         let lowStep = (0, parser_utils_1.isNumericI7)(i7Data[`minstufe_s${tapChangerNumber}`])
             ? i7Data[`minstufe_s${tapChangerNumber}`]
@@ -5744,43 +5835,66 @@ class ConverterIntegral7 {
             const neutralStepIndex = i7TapArray.indexOf(neutralStep);*/
         const lowerVoltageStepCount = (0, utils_2.getTapChangerStepCount)(lowStep, neutralStep);
         const upperVoltageStepCount = (0, utils_2.getTapChangerStepCount)(neutralStep, highStep);
-        const uMin = (0, parser_utils_1.isNumericI7)(i7Data[`umin_s${tapChangerNumber}`])
+        let uMin = (0, parser_utils_1.isNumericI7)(i7Data[`umin_s${tapChangerNumber}`])
             ? i7Data[`umin_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMin;
-        const uMax = (0, parser_utils_1.isNumericI7)(i7Data[`umax_s${tapChangerNumber}`])
+        let uMax = (0, parser_utils_1.isNumericI7)(i7Data[`umax_s${tapChangerNumber}`])
             ? i7Data[`umax_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMax;
-        let lowerVoltageStepIncrement = Math.abs(uMin / lowerVoltageStepCount);
+        let lowerVoltageStepDecrement = Math.abs(uMin / lowerVoltageStepCount);
         let upperVoltageStepIncrement = Math.abs(uMax / upperVoltageStepCount);
         let increaseVoltageStepIncrement = (0, parser_utils_1.isNumericI7)(upperVoltageStepIncrement) ? upperVoltageStepIncrement : 0;
         if (tapChanger instanceof RatioTapChanger_1.RatioTapChanger) {
             const ratioTapChanger = tapChanger;
-            // Min/Max Zusatzspannung sind nicht symmetrisch
-            if (Math.abs(lowerVoltageStepIncrement) !== Math.abs(upperVoltageStepIncrement) || uMax < uMin || ratioPhaseTapChangerPresent) {
+            uMin = uMin * invert;
+            uMax = uMax * invert;
+            //test for uMin and uMax voltage add are not symmetrical...
+            if (Math.abs(lowerVoltageStepDecrement) !== Math.abs(upperVoltageStepIncrement) || uMax < uMin || uMax === uMin || ratioPhaseTapChangerPresent) {
+                if (uMax === uMin) {
+                    const stop = true;
+                }
                 const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(common_utils_1.CommonUtils.generateUUID(), `${i7Data.bezeichner} W_${tapChangerNumber}`);
                 let step_tmp = 0;
                 let start_step_tmp = step_tmp;
-                // Spannung verringern
-                for (let i = 0; i < Math.abs(lowerVoltageStepCount); i++) {
-                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((lowerVoltageStepIncrement * Math.abs(lowerVoltageStepCount - i)) / 100)));
-                    step_tmp = i;
+                //voltage decrement
+                if (uMin < 0) {
+                    for (let i = 0; i < Math.abs(lowerVoltageStepCount); i++) {
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((Math.abs(lowerVoltageStepDecrement) * Math.abs(lowerVoltageStepCount - i)) / 100)));
+                        step_tmp = i;
+                    }
+                }
+                else {
+                    for (let i = 0; i < Math.abs(lowerVoltageStepCount); i++) {
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((lowerVoltageStepDecrement * Math.abs(lowerVoltageStepCount - i)) / 100)));
+                        step_tmp = i;
+                    }
                 }
-                // neutral Step
+                //neutral step
                 step_tmp++;
                 (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[step_tmp], 1);
                 step_tmp++;
                 start_step_tmp = step_tmp;
-                // Spannung erhoehen
-                for (let i = start_step_tmp; i < start_step_tmp + Math.abs(upperVoltageStepCount); i++) {
-                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)));
+                //voltage increment
+                if (uMax > 0) {
+                    for (let i = start_step_tmp; i < start_step_tmp + Math.abs(upperVoltageStepCount); i++) {
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 + ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)));
+                    }
+                }
+                else {
+                    for (let i = start_step_tmp; i < start_step_tmp + Math.abs(upperVoltageStepCount); i++) {
+                        (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[i], (1 - ((upperVoltageStepIncrement * (i - start_step_tmp + 1)) / 100)));
+                    }
                 }
                 tapChanger.ratioTapChangerTable = ratioTapChangerTable;
                 ratioTapChangerTable.ratioTapChanger = tapChanger;
-                // Durchschnitt
-                ratioTapChanger.stepVoltageIncrement = Math.abs(Math.round(lowerVoltageStepIncrement)) + Math.abs(Math.round(increaseVoltageStepIncrement)) / 2;
+                //average
+                //ratioTapChanger.stepVoltageIncrement = Math.abs(Math.round(lowerVoltageStepDecrement)) + Math.abs(Math.round(increaseVoltageStepIncrement)) / 2;
                 cimModel.addRatioTapChangerTable(ratioTapChangerTable);
             }
-            ratioTapChanger.stepVoltageIncrement = increaseVoltageStepIncrement;
+            else {
+                //uMin and uMax are symmetrical
+                ratioTapChanger.stepVoltageIncrement = increaseVoltageStepIncrement;
+            }
         }
         if (tapChanger instanceof PhaseTapChangerNonLinear_1.PhaseTapChangerNonLinear) {
             tapChanger.voltageStepIncrement = increaseVoltageStepIncrement;
@@ -5793,8 +5907,8 @@ class ConverterIntegral7 {
         tapChanger.neutralStep = neutralStep;
         tapChanger.normalStep = currentStep;
         tapChanger.step = currentStep;
-        if (Math.abs(lowerVoltageStepIncrement) !== Math.abs(increaseVoltageStepIncrement)) {
-            this.logger.info(`Trafo ${i7Data.id}: Zusatzspannung Min/Max sind nicht symmetrisch  MIN ${lowerVoltageStepIncrement} MAX ${increaseVoltageStepIncrement}. Das Attribut voltageStepIncrement i.H.v ${increaseVoltageStepIncrement} könnte inkorrekt sein.`);
+        if (Math.abs(lowerVoltageStepDecrement) !== Math.abs(increaseVoltageStepIncrement)) {
+            this.logger.info(`Trafo ${i7Data.id}: Zusatzspannung Min/Max sind nicht symmetrisch  MIN ${lowerVoltageStepDecrement} MAX ${increaseVoltageStepIncrement}. Das Attribut voltageStepIncrement i.H.v ${increaseVoltageStepIncrement} könnte inkorrekt sein.`);
         }
     }
     createRatioTapChanger(i7Data, transformerEnds, cimModel, regulatingConnectivityNode, gestufteSeite, tapChangerNumber, spannungsband, transformerinfo) {
@@ -5811,6 +5925,9 @@ class ConverterIntegral7 {
          * */
         /** Regelung */
         const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`), this.objectMappingConfig.standardiseUuid), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+        if (ratioTapChanger.mrid === "df659ba2-a075-4f7d-bdd6-6b038cae962a") {
+            const stop = true;
+        }
         ratioTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) ? !(0, parser_utils_1.convertToBooleanI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) : false;
         ratioTapChanger.transformerEnd = transformerEnd;
         //transformerEnd.ratioTapChanger = ratioTapChanger;
@@ -5852,7 +5969,7 @@ class ConverterIntegral7 {
             cimModel.addTapChangerControl(tapChangerControl);
         }
         else {
-            this.logger.error(`Trafo ${i7Data.id}: TapChangerControl konnte nicht erstellt werden.`);
+            this.logger.debug(`debug --- Trafo ${i7Data.id}: TapChangerControl konnte nicht erstellt werden.`);
         }
         cimModel.addRatioTapChanger(ratioTapChanger);
         return ratioTapChanger;
@@ -5900,14 +6017,24 @@ class ConverterIntegral7 {
             }
             default: {
                 // There is no information given about special tapchanger control, thus create PhaseTapChangerLinear
-                const phaseTapChangerLin = new PhaseTapChangerLinear_1.PhaseTapChangerLinear((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`), this.objectMappingConfig.standardiseUuid), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                phaseTapChanger = phaseTapChangerLin;
-                cimModel.addPhaseTapChangerLinear(phaseTapChangerLin);
+                /**const phaseTapChangerLin = new PhaseTapChangerLinear(getUUID(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                 phaseTapChanger = phaseTapChangerLin;
+                 cimModel.addPhaseTapChangerLinear(phaseTapChangerLin);*/
+                const phaseTapChangerAsym = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                phaseTapChangerAsym.windingConnectionAngle = winkel;
+                phaseTapChanger = phaseTapChangerAsym;
+                cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsym);
                 break;
             }
         }
+        if (phaseTapChanger.mrid === "df659ba2-a075-4f7d-bdd6-6b038cae962a") {
+            const stop = true;
+        }
+        if (phaseTapChanger.mrid === "3d0bdc23-fe46-408d-99b3-369a02d28a28") {
+            const stop = true;
+        }
         // Attribute
-        phaseTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`) ? (0, parser_utils_1.convertToBooleanI7)(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`) : false;
+        phaseTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) ? (0, parser_utils_1.convertToBooleanI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) : false;
         phaseTapChanger.transformerEnd = transformerEnd;
         //transformerEnd.phaseTapChanger = phaseTapChanger;
         // Wirkleistungsregelung Anschluss
@@ -5946,7 +6073,7 @@ class ConverterIntegral7 {
             cimModel.addTapChangerControl(tapChangerControl);
         }
         else {
-            this.logger.error(`Trafo ${i7Data.id}: Trafo ${i7Data.id}: TapChangerControl konnte nicht erstellt werden.`);
+            this.logger.debug(`debug --- Trafo ${i7Data.id}: TapChangerControl konnte nicht erstellt werden.`);
         }
         return phaseTapChanger;
     }
@@ -6268,32 +6395,98 @@ function getGeoCoordinates(i7Data) {
     return undefined;
 }
 exports.getGeoCoordinates = getGeoCoordinates;
-function getDCNodeFromConverter(acDcConverter) {
+function getDCNodeFromConverter(acDcConverter, polarity) {
     let ret_val = undefined;
     if (acDcConverter.dCTerminals) {
         for (const terminal of acDcConverter.dCTerminals.values()) {
-            if (terminal.dcNode) {
+            if (terminal.dcNode && terminal.polarity === polarity) {
                 ret_val = terminal.dcNode;
             }
         }
     }
     return ret_val;
 }
-function logExecutionTime(logger, startTime, text) {
-    logger.debug(`${text} ${(perf_hooks.performance.now() - startTime) / 1000} seconds`);
-    console.log(`${text} ${(perf_hooks.performance.now() - startTime) / 1000} seconds`);
+function createDCGround(cimModel, acDCConverter, i7Data) {
+    const dcConverterUnit = acDCConverter.equipmentContainer;
+    const dcGround = new DCGround_1.DCGround((0, parser_utils_1.getUUID)(i7Data.guid_dcground), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCG'], 32, true));
+    const dcTerminalG = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalg), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCG_DCT']));
+    const dcTerminalM1 = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalm1), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
+    const dcNodeG = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodem1));
+    dcTerminalG.dCConductingEquipment = dcGround;
+    dcTerminalM1.dCConductingEquipment = acDCConverter;
+    dcTerminalM1.polarity = DCPolarityKind_1.DCPolarityKind.middle;
+    dcTerminalG.dcNode = dcNodeG;
+    dcTerminalM1.dcNode = dcNodeG;
+    dcGround.equipmentContainer = dcConverterUnit;
+    dcGround.dCTerminals.set(dcTerminalG.getUUID(), dcTerminalG);
+    dcNodeG.dcEquipmentContainer = dcConverterUnit;
+    dcNodeG.dcTerminals.set(dcTerminalG.getUUID(), dcTerminalG);
+    dcNodeG.dcTerminals.set(dcTerminalM1.getUUID(), dcTerminalM1);
+    acDCConverter.dCTerminals.set(dcTerminalM1.getUUID(), dcTerminalM1);
+    cimModel.addDCTerminal(dcTerminalG);
+    cimModel.addDCGround(dcGround);
+    cimModel.addDCGroundTerminal(dcTerminalM1);
+    cimModel.addDCNode(dcNodeG);
+    /** EQ-SC */
+    dcGround.r = undefined;
+    dcGround.inductance = undefined;
+    return dcNodeG;
 }
-function createDCGround(acdcConverter) {
-    // TODO
-    return new DCGround_1.DCGround();
+/**
+ *
+ * @param acDCConverter
+ * @param i7Data
+ * @param endNumber Start means a value of '1'. Target means a value of '2'.
+ */
+function connectDCGround(cimModel, acdcConverter, i7Data, dcNode, polarity) {
+    let dcTerminalMx = undefined;
+    let dcNodeG = dcNode;
+    const dcTerminalM1UUID = (0, parser_utils_1.getUUID)(i7Data.guid_dcterminalm1);
+    const dcTerminalM2UUID = (0, parser_utils_1.getUUID)(i7Data.guid_dcterminalm2);
+    if (dcNodeG.dcTerminals.get(dcTerminalM1UUID)) {
+        dcTerminalMx = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(dcTerminalM2UUID), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_NEG', '_DCT']));
+    }
+    else {
+        dcTerminalMx = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(dcTerminalM1UUID), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
+    }
+    dcTerminalMx.polarity = polarity;
+    dcNodeG.dcTerminals.set(dcTerminalMx.getUUID(), dcTerminalMx);
+    acdcConverter.dCTerminals.set(dcTerminalMx.getUUID(), dcTerminalMx);
+    dcTerminalMx.dCConductingEquipment = acdcConverter;
+    dcTerminalMx.dcNode = dcNodeG;
+    cimModel.addDCGroundTerminal(dcTerminalMx);
 }
-exports.createDCGround = createDCGround;
-function createNeutralGroundReturn(dcConverterUnit1, dcConverterUnit12) {
-    // TODO
+function createNeutralGroundReturn(cimModel, i7Data, acdcConverterStart, acdcConverterTarget) {
+    let dcNodeM1 = (0, utils_1.getDCNodeGroundByDCConverterUnit)(cimModel, acdcConverterStart.getUUID());
+    let dcNodeM2 = (0, utils_1.getDCNodeGroundByDCConverterUnit)(cimModel, acdcConverterTarget.getUUID());
+    let dcTerminalN1 = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(undefined), (0, util_create_1.createNotation)(['NeutrallineStart_DCT']));
+    let dcTerminalN2 = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(undefined), (0, util_create_1.createNotation)(['NeutrallineTarget_DCT']));
+    //let dcNeutralLine:DCLineSegment = new DCLineSegment(getUUID(undefined), createNotation([getName(i7Data), '_neutral','_DCLS'],32,true), createNotation([i7Data.kurzname,'_neg'],12,true), 'neutral line not contained in INT7 data model');
+    if (dcNodeM1 !== undefined) {
+        dcNodeM1.dcTerminals.set(dcTerminalN1.getUUID(), dcTerminalN1);
+        acdcConverterStart.dCTerminals.set(dcTerminalN1.getUUID(), dcTerminalN1);
+    }
+    else {
+        const uuid = (0, parser_utils_1.getUUID)(i7Data.guid_dcnodem1);
+        dcNodeM1 = new DCNode_1.DCNode(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_DCCN'], 32, true), 'M1');
+        dcNodeM1.dcTerminals.set(dcTerminalN1.getUUID(), dcTerminalN1);
+        dcTerminalN1.dCConductingEquipment = undefined;
+    }
+    if (dcNodeM2 !== undefined) {
+        dcNodeM2.dcTerminals.set(dcTerminalN2.getUUID(), dcTerminalN2);
+    }
+    else {
+        const uuid = (0, parser_utils_1.getUUID)(i7Data.guid_dcnodem2);
+        dcNodeM2 = new DCNode_1.DCNode(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_DCCN'], 32, true), 'M2');
+        dcNodeM2.dcTerminals.set(dcTerminalN2.getUUID(), dcTerminalN2);
+    }
+    cimModel.addACDCConverterDCTerminal(dcTerminalN1);
+    cimModel.addACDCConverterDCTerminal(dcTerminalN2);
+    //cimModel.addDCLineSegment(dcNeutralLineSegment);
+    //cimModel.addDCLine(dcNeutralLine);
 }
-exports.createNeutralGroundReturn = createNeutralGroundReturn;
-function connectDCGround(acdcConverter) {
-    // TODO
+function logExecutionTime(logger, startTime, text) {
+    logger.debug(`${text} ${(perf_hooks.performance.now() - startTime) / 1000} seconds`);
+    console.log(`${text} ${(perf_hooks.performance.now() - startTime) / 1000} seconds`);
 }
-exports.connectDCGround = connectDCGround;
 //# sourceMappingURL=converter.integral7.js.map