@enervance/insight-cim-model 0.0.101 → 0.0.103

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getGeoCoordinates = exports.ConverterIntegral7 = void 0;
+exports.connectDCGround = exports.createNeutralGroundReturn = exports.createDCGround = exports.getGeoCoordinates = exports.ConverterIntegral7 = void 0;
 const tslib_1 = require("tslib");
 const fs = require("fs");
 const JSZip = require("jszip");
@@ -25,7 +25,6 @@ const ACDCConverterDCTerminal_1 = require("../../model/dc/ACDCConverterDCTermina
 const CsConverter_1 = require("../../model/dc/CsConverter.js");
 const CsOperatingModeKind_1 = require("../../model/dc/CsOperatingModeKind.js");
 const DCConverterOperatingModeKind_1 = require("../../model/dc/DCConverterOperatingModeKind.js");
-const DCConverterUnit_1 = require("../../model/dc/DCConverterUnit.js");
 const DCLine_1 = require("../../model/dc/DCLine.js");
 const DCLineSegment_1 = require("../../model/dc/DCLineSegment.js");
 const DCNode_1 = require("../../model/dc/DCNode.js");
@@ -39,7 +38,6 @@ const UnitMultiplier_1 = require("../../model/domain/UnitMultiplier.js");
 const UnitSymbol_1 = require("../../model/domain/UnitSymbol.js");
 const Voltage_1 = require("../../model/domain/Voltage.js");
 const SynchronousMachineTimeConstantReactance_1 = require("../../model/dynamics/standard-models/synchronous-machine-dynamics/SynchronousMachineTimeConstantReactance.js");
-const EquivalentBranch_1 = require("../../model/equivalents/EquivalentBranch.js");
 const EquivalentInjection_1 = require("../../model/equivalents/EquivalentInjection.js");
 const AMPRIONBay_1 = require("../../model/extensions/amprion/core/AMPRIONBay.js");
 const AMPRIONConnectivityNode_1 = require("../../model/extensions/amprion/core/AMPRIONConnectivityNode.js");
@@ -125,6 +123,12 @@ const dl_converter_i7_1 = require("./dl-convert/dl-converter-i7.js");
 const util_graph2tree_1 = require("../../util/collection/util-graph2tree.js");
 const parser_utils_1 = require("../../utils2/parser.utils.js");
 const common_utils_1 = require("../../utils2/common.utils.js");
+const SVCControlMode_1 = require("../../model/wires/SVCControlMode.js");
+const DCGround_1 = require("../../model/dc/DCGround.js");
+const INTEGRALEquivalentBranch_1 = require("../../model/extensions/amprion/equivalents/INTEGRALEquivalentBranch.js");
+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");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
@@ -745,7 +749,7 @@ class ConverterIntegral7 {
                         integral_prefix_1.MITTIGER_PUNKT +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     const vl = new VoltageLevel_1.VoltageLevel((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname, i7Schluessel);
-                    const un = (0, utils_2.getU)(i7Data.un, defaultValuesConfig.DefaultVoltage);
+                    const un = (0, utils_2.getU)(i7Data.un);
                     const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.exportFramesBoundary);
                     vl.baseVoltage = baseVoltage;
                     cimModel.addVoltageLevel(vl);
@@ -839,7 +843,7 @@ class ConverterIntegral7 {
                     if (frame.boundary) {
                         connectivityNode.boundaryPoint = true;
                     }
-                    const un = (0, utils_2.getU)(i7Data.un, defaultValuesConfig.DefaultVoltage);
+                    const un = (0, utils_2.getU)(i7Data.un);
                     const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, un, this.exportFramesBoundary);
                     /** Spannungsband */
                     integral7.targetVoltages.set(i7Data.id, { usoll: i7Data.usoll, umin: i7Data.umin, umax: i7Data.umax });
@@ -1052,6 +1056,8 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.BELASTUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.BELASTUNG), knotenSfIDs));
                 for (const i7Data of result) {
                     const load = targetClass === cim_class_names_1.ClassNames.ConformLoad ? new INTEGRALConformLoad_1.INTEGRALConformLoad((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CL']), i7Data.kurzname) : new EnergyConsumer_1.EnergyConsumer((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EC']), i7Data.kurzname);
+                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+                    const spannungslos = (0, parser_utils_1.isBooleanI7)(i7Data.spannungslos) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.spannungslos) : undefined;
                     this.setTopologyEnergySourceConsumerObject(cimModel, load, i7Data);
                     /** powerData 0 -> Wirkleistung
                      *            1 -> Blindleitung */
@@ -1060,9 +1066,11 @@ class ConverterIntegral7 {
                         cimModel.addMultiplierFactor(mf);
                         load.multiplierFactorUUID = mf.getUUID();
                     }
+                    /** SSH */
                     const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     load.p = powerData[0];
                     load.q = powerData[1];
+                    /** Extension */
                     load.p_mf = powerData[2] ? powerData[2] : undefined;
                     load.q_mf = powerData[3] ? powerData[3] : undefined;
                     //TODO
@@ -1070,6 +1078,7 @@ class ConverterIntegral7 {
                      conformLoad.qFixed = conformLoad.q; */
                     if (targetClass === cim_class_names_1.ClassNames.ConformLoad) {
                         const conformLoadGroup = cimModel.getObjectByName(defaultValuesConfig.ConformLoadGroup.name, cim_class_names_1.ClassNames.ConformLoadGroup);
+                        //createSvPowerFlow(cimModel, flussinfo3p.p, flusinfo3p)
                         load.loadGroup = conformLoadGroup;
                         cimModel.addConformLoad(load);
                     }
@@ -1140,6 +1149,7 @@ class ConverterIntegral7 {
         });
     }
     convertGeneratoren(cimModel, knotenSfIDs, energyTypesConfig) {
+        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Generatoren werden als GeneratingUnit und SynchronousMachine abgebildet
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.GENERATOR)) {
@@ -1148,17 +1158,17 @@ class ConverterIntegral7 {
                     const genType = this.generatorTypen.get(i7Data.nametyp);
                     const synchronousMachine = new INTEGRALSynchronousMachine_1.INTEGRALSynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid), (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 maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : 0;
-                    const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : 0; //exported by capability curve data
+                    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));
                     const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
                     const flagCondenserOperationMode = (0, parser_utils_1.isBooleanI7)(i7Data.flag_phasenschieber) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_phasenschieber) : true;
-                    const isRotatingPhaseShifter = mf !== undefined && flagCondenserOperationMode && maxP === 0 && minP === 0;
-                    const isGenerator = (maxP >= 0 || maxP === undefined) && (minP >= 0 || minP === undefined);
-                    const isMotor = (maxP <= 0 || maxP === undefined) && (minP <= 0 || minP === undefined);
-                    synchronousMachine.nameprimaertyp = i7Data.nameprimaertyp;
+                    const isRotatingPhaseShifter = (mf !== undefined && maxP === 0 && minP === 0) || flagCondenserOperationMode;
+                    const isGenerator = (maxP > 0 || maxP === undefined);
+                    const isMotor = (minP < 0 || minP === undefined);
+                    synchronousMachine.nameprimaertyp = i7Data.nameprimaertyp !== undefined ? i7Data.nameprimaertyp : (genType !== undefined ? genType.nameprimaertyp : undefined);
                     /** Set machine type */
                     if (isRotatingPhaseShifter && isGenerator && isMotor) {
                         synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor;
@@ -1189,11 +1199,11 @@ class ConverterIntegral7 {
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
-                    const generatorOperationMode = p !== undefined && p >= 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generator
+                    const generatorOperationMode = p !== undefined && p > 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generator
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenser
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
-                    const motorOperationMode = p !== undefined && p <= 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motor
+                    const motorOperationMode = p !== undefined && p < 0 && (synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motor
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrMotor
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.motorOrCondenser
                         || synchronousMachine.type === SynchronousMachineKind_1.SynchronousMachineKind.generatorOrCondenserOrMotor);
@@ -1202,7 +1212,6 @@ class ConverterIntegral7 {
                     }
                     else if (!condenserOperationMode && generatorOperationMode && !motorOperationMode) {
                         synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
-                        synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
                     }
                     else if (!condenserOperationMode && !generatorOperationMode && motorOperationMode) {
                         synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.motor;
@@ -1245,60 +1254,54 @@ class ConverterIntegral7 {
                     synchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined; //convert to load sign system
                     /** TODO Berechnung überprüfen => DONE */
                     /*          const s = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));*/
-                    const sr = (0, parser_utils_1.isNumericI7)(i7Data.sr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sr) : genType === null || genType === void 0 ? void 0 : genType.sr;
+                    const sr = (0, parser_utils_1.isNumericI7)(i7Data.sr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sr) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.sr) ? (0, parser_utils_1.convertToNumberI7)(genType.sr) : undefined);
                     if (sr && sr >= 0) {
                         synchronousMachine.ratedS = sr;
                     }
                     else {
                         synchronousMachine.ratedS = Math.sqrt(Math.pow(maxP, 2) + Math.pow(maxQvonPmax, 2));
                     }
-                    const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : (0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined;
+                    const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.ur) ? genType.ur : undefined);
                     const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : ur;
-                    const cosphir = (0, parser_utils_1.isNumericI7)(i7Data.cosphir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cosphir) : genType.cosphir;
-                    synchronousMachine.ratedU = ur ? ur : usoll;
-                    // TODO
-                    synchronousMachine.aggregate = true; //synchronousMachine.aggregate = false;
+                    const cosphir = (0, parser_utils_1.isNumericI7)(i7Data.cosphir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.cosphir) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.cosphir) ? (0, parser_utils_1.convertToNumberI7)(genType.cosphir) : undefined);
+                    synchronousMachine.ratedU = ur !== undefined ? ur : usoll;
+                    synchronousMachine.aggregate = false;
                     /** Percent of the coordinated reactive control that comes from this machine.*/
                     /** TODO qPercent */
                     // synchronousMachine.qPercent = 0; // I7 Export
-                    /** TODO ratedPowerFactor */
-                    /**Export des Leistungszahlfaktor cosinus phi.*/
                     synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
-                    // synchronousMachine.qPercent = i7Data.cos_phi ? (1 - i7Data.cosphir) : 0;       // PF/&I7 Export immer 1
-                    // synchronousMachine.earthing = false; // I7 Export alle nicht geerdet
-                    synchronousMachine.r = (0, parser_utils_1.isNumericI7)(i7Data.rg) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rg) : genType === null || genType === void 0 ? void 0 : genType.rg;
-                    // synchronousMachine.r0 = 0;
-                    // synchronousMachine.r2 = 0;
-                    // synchronousMachine.x0 = 0;
-                    // synchronousMachine.x2 = 0;
-                    // synchronousMachine.satDirectSubtransX = i7Data.xd2s ? i7Data.xd2s : 0;
+                    /** 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.r2 = 0;
+                    synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 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
-                    // ynchronousMachine.ikk: number;
+                    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.mu: number;
                     // synchronousMachine.satDirectSyncX: number;
                     // synchronousMachine.satDirectTransX: number;
                     // synchronousMachine.shortCircuitRotorType: ShortCircuitRotorKind;
                     // synchronousMachine.voltageRegulationRange: number;
-                    // synchronousMachine.p: number;
-                    // synchronousMachine.q: number;
-                    // synchronousMachine.controlEnabled: number;
                     /** Create ReactiveCapabilityCurves */
                     if (minP && maxP && minQvonPmin && maxQvonPmax) {
-                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)(['CurveData', synchronousMachine.mrid, '_RCC']));
+                        const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve((0, parser_utils_1.getUUID)(i7Data.guid_rcc), (0, util_create_1.createNotation)(['CurveData', synchronousMachine.mrid, '_RCC']));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
                         reactiveCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
                         reactiveCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
                         //reactive capability curve data for pmin
-                        const curveData1 = new CurveData_1.CurveData(common_utils_1.CommonUtils.generateUUID());
+                        const curveData1 = new CurveData_1.CurveData((0, parser_utils_1.getUUID)(i7Data.guid_cd1));
                         curveData1.curve = reactiveCapabilityCurve;
                         curveData1.xvalue = minP; //pMin
                         curveData1.y1value = minQvonPmin; //qMin pMin
                         curveData1.y2value = maxQvonPmin; //qMax pMin
                         cimModel.addCurveData(curveData1);
                         //reactive capability curve data for pmax
-                        const curveData2 = new CurveData_1.CurveData(common_utils_1.CommonUtils.generateUUID());
+                        const curveData2 = new CurveData_1.CurveData((0, parser_utils_1.getUUID)(i7Data.guid_cd2));
                         curveData2.curve = reactiveCapabilityCurve;
                         curveData2.xvalue = maxP; //pMax
                         curveData2.y1value = minQvonPmax; //qMin pMax
@@ -1307,20 +1310,19 @@ class ConverterIntegral7 {
                         cimModel.addReactiveCapabilityCurve(reactiveCapabilityCurve);
                         synchronousMachine.initialReactiveCapabilityCurveUUID = reactiveCapabilityCurve.mrid;
                     }
-                    // RegulatingControl
+                    /** RegulatingControl */
                     let regulatingControl = undefined;
                     // TODO targetDeadband: ab welcher spannung soll reguliert werden.
                     switch (i7Data.spannungsgeregelt) {
-                        // TODO Welche Modi sind möglich?
                         case 1: {
-                            regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)(['GEN'], 32, true));
-                            regulatingControl.targetValue = usoll;
+                            regulatingControl = new RegulatingControl_1.RegulatingControl((0, parser_utils_1.getUUID)(i7Data.guid_rc), (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 = inBetrieb;
-                            synchronousMachine.controlEnabled = inBetrieb;
+                            regulatingControl.enabled = true;
+                            synchronousMachine.controlEnabled = true;
                             regulatingControl.addRegulatingCondEq(synchronousMachine);
-                            synchronousMachine.regulatingControlUUID = regulatingControl.mrid;
+                            synchronousMachine.regulatingControlUUID = regulatingControl.getUUID();
                             cimModel.addRegulatingControl(regulatingControl);
                             break;
                         }
@@ -1336,18 +1338,18 @@ class ConverterIntegral7 {
                         if (generatingUnitConfig) {
                             switch (generatingUnitConfig.class) {
                                 case 'ThermalGeneratingUnit': {
-                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit((0, parser_utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_TGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new ThermalGeneratingUnit_1.ThermalGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_TGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     if (generatingUnitConfig.fuelType) {
                                         (0, utils_2.generateFuelType)(i7Data.nameprimaertyp, generatingUnitConfig.fuelType, generatingUnit, cimModel);
                                     }
                                     break;
                                 }
                                 case 'SolarGeneratingUnit': {
-                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit((0, parser_utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_SGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new SolarGeneratingUnit_1.SolarGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_SGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     break;
                                 }
                                 case 'WindGeneratingUnit': {
-                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit((0, parser_utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_WGU']), i7Data.kurzname, i7Data.nameprimaertyp);
+                                    generatingUnit = new WindGeneratingUnit_1.WindGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_WGU']), i7Data.kurzname, i7Data.nameprimaertyp);
                                     switch (generatingUnitConfig.fuelType) {
                                         case 'onshore': {
                                             generatingUnit.windGenUnitType = WindGenUnitKind_1.WindGenUnitKind.onshore;
@@ -1366,17 +1368,17 @@ class ConverterIntegral7 {
                                     break;
                                 }
                                 case 'NuclearGeneratingUnit': {
-                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit((0, parser_utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_NGU']), i7Data.kurzname);
+                                    generatingUnit = new NuclearGeneratingUnit_1.NuclearGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_NGU']), i7Data.kurzname);
                                     break;
                                 }
                                 case 'HydroGeneratingUnit': {
-                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit((0, parser_utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_HGU']), i7Data.kurzname);
+                                    generatingUnit = new HydroGeneratingUnit_1.HydroGeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_HGU']), i7Data.kurzname);
                                     /** Default pumpAndGenerator*/
                                     generatingUnit.energyConversionCapability = HydroEnergyConversionKind_1.HydroEnergyConversionKind.pumpAndGenerator;
                                     break;
                                 }
                                 default: {
-                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
+                                    generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                                     break;
                                 }
                             }
@@ -1384,7 +1386,7 @@ class ConverterIntegral7 {
                         else {
                             /** Wenn über Config keine spezielle Klasse bestimmt wurde,
                              * dann initialisiere die Standardklasse GeneratingUnit. */
-                            generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(''), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
+                            generatingUnit = new GeneratingUnit_1.GeneratingUnit((0, parser_utils_1.getUUID)(i7Data.guid_gu), (0, util_create_1.createNotation)([i7Data.bezeichner, '_GU']), i7Data.kurzname);
                         }
                         // TODO: genControlSource is not required.
                         //generatingUnit.genControlSource = GeneratorControlSource.onAGC;
@@ -1487,10 +1489,10 @@ class ConverterIntegral7 {
                     const powerData = (0, utils_2.getActiveReactivePower)(i7Data, mf);
                     const p = powerData[0];
                     const q = powerData[1];
-                    asynchronousMachine.setActivePower(p * -1);
-                    asynchronousMachine.setReactivePower(q * -1);
-                    asynchronousMachine.p_mf = powerData[2] ? powerData[2] * -1 : undefined;
-                    asynchronousMachine.q_mf = powerData[3] ? powerData[3] * -1 : undefined;
+                    asynchronousMachine.setActivePower(p);
+                    asynchronousMachine.setReactivePower(q);
+                    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;
@@ -1680,7 +1682,7 @@ class ConverterIntegral7 {
                 const prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
                 externalNetworkInjection.referencePriority = prio;
                 externalNetworkInjection.aggregate = true; // default Wert im I7 Export
-                externalNetworkInjection.ikSecond = true; // default Wert im I7 Export
+                externalNetworkInjection.ikSecond = undefined; // default Wert im I7 Export
                 /*        externalNetworkInjection.voltageFactor
                 externalNetworkInjection.maxInitialSymShCCurrent
                 externalNetworkInjection.minInitialSymShCCurrent
@@ -1706,19 +1708,23 @@ class ConverterIntegral7 {
     convertErsatzQuerZweige2EquivalentInjection(cimModel, result) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
-                const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                 const einspeisePrio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : 1;
                 const flag_lfl = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl);
                 const flag_ks = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks);
                 const usoll = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
                 const r_ext = (0, parser_utils_1.isNumericI7)(i7Data.r_ext) ? (0, parser_utils_1.convertToNumberI7)(i7Data.r_ext) : undefined;
                 const x_ext = (0, parser_utils_1.isNumericI7)(i7Data.x_ext) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x_ext) : undefined;
+                const sk2 = (0, parser_utils_1.isNumericI7)(i7Data.sk) ? (0, parser_utils_1.convertToNumberI7)(i7Data.sk) : undefined;
+                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 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 equivalentInjection = new INTEGRALEquivalentInjection_1.INTEGRALEquivalentInjection((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_EI']), i7Data.kurzname);
-                equivalentInjection.normallyInService = inBetrieb;
-                /** TODO: Take flag_lfl und flag_ks into account. export Extended Ward r_ext and x_ext if given. Devide between flag_lfl === true && flag_ks ===true
-                 * flag_lfl === true && !flag_ks and !flag_lfl && flag_ks see documentation for eq and eq-sc parameter to export for equivalentInjections  */
                 /** Export Extended Ward equivalent with voltage regulation */
-                if (flag_lfl && usoll && (r_ext || x_ext)) {
+                if (flag_lfl && !flag_ks && usoll && (r_ext !== 0 || x_ext !== 0)) {
                     //is regulating equivalent equipment
                     equivalentInjection.regulationCapability = true;
                     equivalentInjection.regulationStatus = true;
@@ -1732,8 +1738,52 @@ class ConverterIntegral7 {
                     equivalentInjection.x0 = 1e9;
                     equivalentInjection.x2 = 1e9;
                 }
-                /** Export equivalent injections with p and q values and r, r1, x, x1 values from network reduction TODO: export as externalnetworkinjection see: Integral INT7XNL Import document */
-                equivalentInjection.aggregate = true; // default Wert im I7 Export
+                else if (!flag_lfl && flag_ks) {
+                    equivalentInjection.regulationCapability = false;
+                    equivalentInjection.r = r1;
+                    equivalentInjection.r0 = r0;
+                    equivalentInjection.r2 = r1;
+                    equivalentInjection.x = x1;
+                    equivalentInjection.x0 = x0;
+                    equivalentInjection.x2 = x1;
+                }
+                else if (flag_lfl && usoll && einspeisePrio) {
+                    equivalentInjection.regulationCapability = true;
+                    equivalentInjection.regulationStatus = true;
+                    equivalentInjection.regulationTarget = usoll;
+                    equivalentInjection.r = r1;
+                    equivalentInjection.r0 = r0;
+                    equivalentInjection.r2 = r1;
+                    equivalentInjection.x = x1;
+                    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;
+                    equivalentInjection.r0 = 1e9;
+                    equivalentInjection.r2 = 1e9;
+                    equivalentInjection.x = 1e9;
+                    equivalentInjection.x0 = 1e9;
+                    equivalentInjection.x2 = 1e9;
+                }
+                equivalentInjection.sk2 = sk2;
+                equivalentInjection.p_ein = p_ein;
+                equivalentInjection.q_ein = q_ein;
+                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);
                 // ToDo PSRType
                 cimModel.addEquivalentInjection(equivalentInjection);
@@ -1881,7 +1931,7 @@ class ConverterIntegral7 {
                     // Topologie
                     /* Anfang
                       * 3 moegliche Anschluesse
-                      *  KontenSo -> Anschluesspunkt
+                      *  KontenSo -> Anschlusspunkt
                       *  KnotenSf -> Schaltfeldpunkt
                       *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
                     const i7Schluessel = integral_prefix_1.ERSATZLAENGSZWEIG_PRAEFIX +
@@ -1893,49 +1943,86 @@ class ConverterIntegral7 {
                         integral_prefix_1.MITTIGER_PUNKT +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.stkabname);
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid);
-                    const equivalentBranch = new EquivalentBranch_1.EquivalentBranch(rdfid, (0, util_create_1.createNotation)([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
-                    // TODO alles überprüfen
-                    /*        equivalentBranch.negativeR12 = i7Data.r12_lfl;
-                    equivalentBranch.negativeR21 = i7Data.r21_lfl;
-                    equivalentBranch.negativeX12 = i7Data.x12_lfl;
-                    equivalentBranch.negativeX21 = i7Data.x21_lfl;
-            
-                    equivalentBranch.positiveR12 = i7Data.r12_lfl;
-                    equivalentBranch.positiveR21 = i7Data.r21_lfl;
-                    equivalentBranch.positiveX12 = i7Data.x12_lfl;
-                    equivalentBranch.positiveX21 = i7Data.x21_lfl;
-            
-                    equivalentBranch.r = equivalentBranch.negativeR12;
-                    equivalentBranch.x = equivalentBranch.negativeX21;
-                    equivalentBranch.r21 = equivalentBranch.positiveR12;
-            
-                    equivalentBranch.x21 = equivalentBranch.negativeX21*/
-                    /*        equivalentBranch.zeroR12 = i7Data.r12_ks;
-                    equivalentBranch.zeroR21 = i7Data.r12_ks;
-                    equivalentBranch.zeroX12 = isNaN(i7Data.x12_ks) ? 0.1 : i7Data.x12_ks;
-                    equivalentBranch.zeroX21 = isNaN(i7Data.x12_ks) ? 0.1 : i7Data.x12_ks;*/
-                    const ur1 = (0, utils_2.getU)(i7Data.ur1, defaultValuesConfig.DefaultVoltage);
-                    const ur2 = (0, utils_2.getU)(i7Data.ur2, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltageUr1 = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur1, this.exportFramesBoundary);
-                    const baseVoltageUr2 = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur2, this.exportFramesBoundary);
-                    if (baseVoltageUr1) {
-                        equivalentBranch.baseVoltage = baseVoltageUr1;
-                    }
-                    else if (baseVoltageUr2) {
-                        equivalentBranch.baseVoltage = baseVoltageUr2;
-                    }
+                    const equivalentBranch = new INTEGRALEquivalentBranch_1.INTEGRALEquivalentBranch(rdfid, (0, util_create_1.createNotation)([i7Data.bezeichner, '_', rdfid.substring(0, 8), '_EB'], 32, true), i7Data.kurzname, i7Schluessel);
+                    const flag_lfl = (0, parser_utils_1.isBooleanI7)(i7Data.flag_lfl) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl) : false;
+                    const flag_ks = (0, parser_utils_1.isBooleanI7)(i7Data.flag_ks) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks) : false;
                     // Topologie
-                    /* Anfang
-             * 3 moegliche Anschluesse
-             *  KontenSo -> Anschluesspunkt
-             *  KnotenSf -> Schaltfeldpunkt
-             *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
-                    /*
-                    const startUUID = this.integralID2UUID.get(i7Data.aknoten);
-                    const targetUUID = this.integralID2UUID.get(i7Data.eknoten);
-            */
+                    /** Anfang
+                     * 3 moegliche Anschluesse
+                     *  KontenSo -> Anschluesspunkt
+                     *  KnotenSf -> Schaltfeldpunkt
+                     *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt */
                     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)) {
+                        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.positiveR21 = equivalentBranch.positiveR12;
+                        equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.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.zeroR21 = equivalentBranch.zeroR12;
+                        equivalentBranch.zeroX12 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0) : 10e9;
+                        equivalentBranch.zeroX21 = equivalentBranch.zeroX12;
+                    }
+                    else if (!flag_lfl && flag_ks) {
+                        /**EQ-SC */
+                        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;
+                        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.zeroR21 = equivalentBranch.zeroR12;
+                        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.
+                        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.positiveR21 = equivalentBranch.positiveR12;
+                        equivalentBranch.positiveX12 = (0, parser_utils_1.isNumericI7)(i7Data.x12_ks) ? (0, parser_utils_1.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.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.`);
+                    }
+                    const bdf = [];
+                    bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten)));
+                    bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten)));
+                    const baseVoltages = (0, utils_2.getTerminalUn)(cimModel, bdf, equivalentBranch);
+                    if (baseVoltages[0]) {
+                        equivalentBranch.baseVoltage = baseVoltages[0];
+                    }
+                    else if (baseVoltages[1]) {
+                        equivalentBranch.baseVoltage = baseVoltages[1];
+                    }
+                    else {
+                        equivalentBranch.baseVoltage = undefined;
+                        this.logger.error(`Ersatzlängszweig mit GUID ${equivalentBranch.getUUID()} konnte keine Bezugsspannung ermittelt werden.`);
+                    }
+                    equivalentBranch.ur1 = (0, parser_utils_1.isNumericI7)(i7Data.ur1) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur1) : undefined;
+                    equivalentBranch.ur2 = (0, parser_utils_1.isNumericI7)(i7Data.ur2) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur2) : undefined;
                     cimModel.addEquivalentBranch(equivalentBranch);
                     this.checkErsatzZweigID(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, equivalentBranch.mrid, integral_sql_1.Integral7TableNames.ERSATZLAENGSZWEIG);
@@ -1952,77 +2039,115 @@ class ConverterIntegral7 {
         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));
+                let sternpunktKnotenResult = [];
+                let sternpunktKnotenMap = new Map();
+                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN)) {
+                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), []));
+                    for (const spKnoten of sternpunktKnotenResult) {
+                        sternpunktKnotenMap.set(spKnoten.id, spKnoten);
+                    }
+                }
                 for (const i7Data of result) {
-                    try {
-                        if (i7Data.id === 940386872) {
-                            console.log();
-                        }
-                        const shunt = new LinearShuntCompensator_1.LinearShuntCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_LSC']), i7Data.kurzname);
-                        // Get electrical properties
-                        const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
-                        const qr = (0, parser_utils_1.isNumericI7)(i7Data.qr) ? i7Data.qr : undefined;
-                        const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? i7Data.pr : undefined;
-                        shunt.nomU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? i7Data.ur : undefined;
-                        // Set electrical properties
-                        shunt.normalSections = (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) ? i7Data.aktstufe : undefined;
-                        shunt.maximumSections = (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) ? i7Data.maxstufe : undefined;
-                        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) : 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 = i7Data.uband; //zulässiges Spannungsband
-                            /** Spannung in kilo*/
-                            regulatingControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
-                            regulatingControl.enabled = inBetrieb;
-                            if (knotenSpgGeregelt) {
-                                const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                                let visited_set = [];
-                                const terminal = (0, util_graph2tree_1.getControlledNode)(cn_point, knotenSpgGeregelt);
-                                if (terminal) {
-                                    const cn = terminal.getConnectivityNode();
-                                    if (cn.getVoltageLevel() === undefined) {
-                                        console.log();
-                                    }
-                                    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'];
+                    const shunt = new LinearShuntCompensator_1.LinearShuntCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_LSC']), i7Data.kurzname);
+                    // Get electrical properties
+                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : undefined;
+                    shunt.normallyInService = inBetrieb;
+                    const qr = (0, parser_utils_1.isNumericI7)(i7Data.qr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qr) : undefined;
+                    const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
+                    shunt.nomU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
+                    // Set electrical properties
+                    // Set electrical properties (EQ)
+                    if ((0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
+                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                        shunt.normalSections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && !(0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
+                        shunt.sections = 1;
+                        shunt.normalSections = 1;
+                        shunt.maximumSections = 1;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) > 0) {
+                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                        shunt.sections = shunt.maximumSections;
+                        shunt.normalSections = shunt.maximumSections;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) <= 0) {
+                        shunt.maximumSections = 1;
+                        shunt.sections = shunt.maximumSections;
+                        shunt.normalSections = shunt.maximumSections;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) > 0) {
+                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                        shunt.normalSections = shunt.sections;
+                        shunt.maximumSections = shunt.normalSections;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) <= 0) {
+                        shunt.sections = 1;
+                        shunt.normalSections = shunt.sections;
+                        shunt.maximumSections = shunt.normalSections;
+                    }
+                    else {
+                        this.logger.error(`Kompensationsdrossel mit GUID ${i7Data.guid} besitzt unerwartete $akstufe oder $maxstufe.`);
+                    }
+                    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), (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.addRegulatingCondEq(shunt);
-                            shunt.regulatingControlUUID = regulatingControl.mrid;
-                            shunt.controlEnabled = inBetrieb;
-                            shunt.regulatingControl = regulatingControl;
-                            cimModel.addRegulatingControl(regulatingControl);
-                            const term = cimModel.terminals.get(regulatingControl.terminalUUID);
-                            if (term) {
-                                term.addRegulatingControl(regulatingControl);
-                            }
-                            else {
-                                let stop = true;
+                                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'];
                             }
                         }
-                        this.setTopologyEnergySourceConsumerObject(cimModel, shunt, i7Data, shunt.regulatingControl, undefined, targetVoltages);
-                        cimModel.addLinearShuntCompensator(shunt);
-                        this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
-                    }
-                    catch (err) {
-                        console.log();
+                        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);
+                    cimModel.addLinearShuntCompensator(shunt);
+                    this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
                 }
             }
             else {
@@ -2036,16 +2161,57 @@ class ConverterIntegral7 {
         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));
+                let sternpunktKnotenResult = [];
+                let sternpunktKnotenMap = new Map();
+                if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN)) {
+                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), []));
+                    for (const spKnoten of sternpunktKnotenResult) {
+                        sternpunktKnotenMap.set(spKnoten.id, spKnoten);
+                    }
+                }
                 for (const i7Data of result) {
                     const shunt = new LinearShuntCompensator_1.LinearShuntCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_LSC']), i7Data.kurzname);
                     // Get electrical properties
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+                    const inBetrieb = (0, parser_utils_1.isBooleanI7)(i7Data.betrieb) ? (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb) : undefined;
                     const qr = (0, parser_utils_1.isNumericI7)(i7Data.qr) ? i7Data.qr : undefined;
                     const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? i7Data.pr : undefined;
                     shunt.nomU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? i7Data.ur : undefined;
-                    // Set electrical properties
-                    shunt.normalSections = (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) ? i7Data.aktstufe : undefined;
-                    shunt.maximumSections = (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) ? i7Data.maxstufe : undefined;
+                    // Set extension properties (AMPI7)
+                    shunt.normallyInService = inBetrieb;
+                    // Set electrical properties (EQ)
+                    if ((0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
+                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                        shunt.normalSections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && !(0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
+                        shunt.sections = 1;
+                        shunt.normalSections = 1;
+                        shunt.maximumSections = 1;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) > 0) {
+                        shunt.maximumSections = (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe);
+                        shunt.sections = shunt.maximumSections;
+                        shunt.normalSections = shunt.maximumSections;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.maxstufe) <= 0) {
+                        shunt.maximumSections = 1;
+                        shunt.sections = shunt.maximumSections;
+                        shunt.normalSections = shunt.maximumSections;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) > 0) {
+                        shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
+                        shunt.normalSections = shunt.sections;
+                        shunt.maximumSections = shunt.normalSections;
+                    }
+                    else if (!(0, parser_utils_1.isNumericI7)(i7Data.maxstufe) && (0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe) <= 0) {
+                        shunt.sections = 1;
+                        shunt.normalSections = shunt.sections;
+                        shunt.maximumSections = shunt.normalSections;
+                    }
+                    else {
+                        this.logger.error(`Kompensationskondensator mit GUID ${i7Data.guid} besitzt unerwartete $akstufe oder $maxstufe.`);
+                    }
                     shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr, shunt.nomU, shunt.maximumSections);
                     shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
                     // RegulatingControl
@@ -2061,16 +2227,18 @@ class ConverterIntegral7 {
                         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 = i7Data.uband; //zulässiges Spannungsband
+                        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 = inBetrieb;
+                        regulatingControl.enabled = true;
                         if (knotenSpgGeregelt) {
                             const cn_point = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
-                            let visited_set = [];
                             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));
@@ -2082,7 +2250,7 @@ class ConverterIntegral7 {
                         }
                         regulatingControl.addRegulatingCondEq(shunt);
                         shunt.regulatingControlUUID = regulatingControl.mrid;
-                        shunt.controlEnabled = inBetrieb;
+                        shunt.controlEnabled = regulatingControl === undefined ? false : regulatingControl.enabled;
                         shunt.regulatingControl = regulatingControl;
                         cimModel.addRegulatingControl(regulatingControl);
                         const term = cimModel.terminals.get(regulatingControl.terminalUUID);
@@ -2093,13 +2261,19 @@ class ConverterIntegral7 {
                             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);
                     cimModel.addLinearShuntCompensator(shunt);
-                    this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL);
+                    this.addIdMapping(i7Data.id, shunt.mrid, integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR);
                 }
             }
             else {
-                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSDROSSEL} ist nicht vorhanden.`);
+                this.logger.debug(`Tabelle ${integral_sql_1.Integral7TableNames.KOMPENSATIONSKONDENSATOR} ist nicht vorhanden.`);
             }
         });
     }
@@ -2110,21 +2284,27 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
-                    // TODO
-                    /*     statVarCom.capacitiveRating
-                   statVarCom.inductiveRating
-                   statVarCom.slope
-                   regulatingControl.discrete = discrete;
-                   regulatingControl.targetDeadband = targetDeadband;
-                   */
+                    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;
+                    const qkapr = (0, parser_utils_1.isNumericI7)(i7Data.qkapr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qkapr) : undefined;
+                    const qindr = (0, parser_utils_1.isNumericI7)(i7Data.qindr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qindr) : undefined;
+                    /** EQ */
+                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(uref, qkapr);
+                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(uref, qindr)) * -1;
+                    statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
+                    statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
+                    statVarCom.aggregate = false;
+                    /** EQ-SC */
+                    /** SSH */
+                    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);
-                    const uref = (0, parser_utils_1.isNumericI7)(i7Data.uref) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uref) : undefined;
-                    regulatingControl.targetValue = uref;
-                    regulatingControl.enabled = inBetrieb;
-                    statVarCom.voltageSetPoint = uref;
-                    statVarCom.controlEnabled = inBetrieb;
+                    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) {
@@ -2137,6 +2317,7 @@ class ConverterIntegral7 {
                                 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.`);
@@ -2146,6 +2327,8 @@ class ConverterIntegral7 {
                             this.logger.debug(`Statcom RegulatingControl ${i7Data.id} konnte dem Trafo ${i7Data.trafo} nicht zugeordnet werden.`);
                         }
                     }
+                    /** EQ */
+                    statVarCom.voltageSetPoint = regulatingControl.targetValue ? regulatingControl.targetValue : ur;
                     cimModel.addStaticVarCompensator(statVarCom);
                     this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.STATCOM);
                 }
@@ -2162,22 +2345,29 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
-                    // TODO
-                    /*     statVarCom.capacitiveRating
-                   statVarCom.inductiveRating
-                   statVarCom.slope
-                   regulatingControl.discrete = discrete;
-                   regulatingControl.targetDeadband = targetDeadband;
-                   */
+                    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;
+                    const qkapr = (0, parser_utils_1.isNumericI7)(i7Data.qkapr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qkapr) : undefined;
+                    const qindr = (0, parser_utils_1.isNumericI7)(i7Data.qindr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qindr) : undefined;
+                    /** EQ */
+                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(uref, qkapr);
+                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(uref, qindr)) * -1;
+                    statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
+                    statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
+                    statVarCom.aggregate = false;
+                    /** EQ-SC */
+                    /** SSH */
+                    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_SVC ${i7Data.id}`, inBetrieb, UnitMultiplier_1.UnitMultiplier.k, RegulatingControlModeKind_1.RegulatingControlModeKind.voltage, cimModel, statVarCom);
+                    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);
-                    const uref = (0, parser_utils_1.isNumericI7)(i7Data.uref) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uref) : undefined;
-                    regulatingControl.targetValue = uref;
-                    regulatingControl.enabled = inBetrieb;
-                    statVarCom.voltageSetPoint = uref;
-                    statVarCom.controlEnabled = inBetrieb;
+                    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);
@@ -2188,6 +2378,7 @@ class ConverterIntegral7 {
                                 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.`);
@@ -2197,9 +2388,10 @@ class ConverterIntegral7 {
                             this.logger.debug(`Statcom RegulatingControl ${i7Data.id} konnte dem Trafo ${i7Data.trafo} nicht zugeordnet werden.`);
                         }
                     }
+                    /** EQ */
+                    statVarCom.voltageSetPoint = regulatingControl.targetValue ? regulatingControl.targetValue : ur;
                     cimModel.addStaticVarCompensator(statVarCom);
-                    cimModel.addRegulatingControl(regulatingControl);
-                    this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.SVC);
+                    this.addIdMapping(i7Data.id, statVarCom.mrid, integral_sql_1.Integral7TableNames.STATCOM);
                 }
             }
             else {
@@ -2213,7 +2405,10 @@ 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.DCConverterUnit(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
+                    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.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : 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;
                     // Topologie
                     /* Anfang
                      * 3 moegliche Anschluesse
@@ -2245,16 +2440,16 @@ class ConverterIntegral7 {
                     /** Bemessungsleistung (Gleichstromseite) in MW
                      * im CS-Fall S = P?
                      * Abhängig vom  */
-                    csConverter.baseS = i7Data.pr;
+                    csConverter.baseS = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
                     /** Bemessungsspannung (Gleichstromseite) in kV*/
-                    csConverter.ratedUdc = i7Data.ur;
-                    /** spannungsabhängige Wirk-Verluste bei Leerlauf mit Bemessungsspannung in kV*/
-                    csConverter.idleLoss = i7Data.p_leer / 1000;
+                    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);
+                    /** 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.switchingLoss = 0;
-                    /*        csConverter.numberOfValves
+                    /* csConverter.numberOfValves
                     csConverter.valveU0*/
                     /** Stromrichter */
                     /** Zündwinkel bei Gleichrichterbetrieb (ins Drehstromnetz eingespeiste Wirkleistung < 0) - etwa 15 Grad */
@@ -2288,10 +2483,11 @@ class ConverterIntegral7 {
                         this.logger.debug(`CsConverter ${i7Data.id} ${csConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
                     /** Topologie DC Seite*/
-                    const dcNode = new DCNode_1.DCNode(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
+                    const dcNode = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodep), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
                     dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
+                    acDCConverterDCTerminal.polarity = DCPolarityKind_1.DCPolarityKind.positive;
                     acDCConverterDCTerminal.dCConductingEquipment = csConverter;
                     csConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
@@ -2304,6 +2500,7 @@ class ConverterIntegral7 {
                     cimModel.addCSConverter(csConverter);
                     cimModel.addDCNode(dcNode);
                     cimModel.addACDCConverterDCTerminal(acDCConverterDCTerminal);
+                    integral7.integralHgueKopf.set(i7Data.id, i7Data);
                     this.checkAnschlussIDs(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, csConverter.mrid, integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH);
                 }
@@ -2311,13 +2508,16 @@ class ConverterIntegral7 {
         });
     }
     convertVsConverterDC(cimModel, integral7, knotenSfIDs) {
-        var _a;
+        var _a, _b;
         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.DCConverterUnit(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
+                    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.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : 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;
                     // Topologie
                     /** Anfang
                      * 3 moegliche Anschluesse
@@ -2339,6 +2539,9 @@ class ConverterIntegral7 {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
                     const vsConverter = new VsConverter_1.VsConverter((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_VSC']), i7Data.kurzname);
+                    if (vsConverter.getUUID() === "1b2b2901-0bb9-4aa3-9117-06d68fbbc7cb") {
+                        let stop = true;
+                    }
                     /** Wenn Leitungen konvertiert werden, wird das Attribut operationMode gesetzt. */
                     vsConverter.equipmentContainer = dcConverterUnit;
                     /** Bemessungsleistung (Gleichstromseite) in MW
@@ -2347,13 +2550,13 @@ class ConverterIntegral7 {
                     vsConverter.baseS = i7Data.pr;
                     /** Bemessungsspannung (Gleichstromseite) in kV*/
                     //If udc is set in Integral data model set converter.ratedUdc as i7Data.udc else take the data value for i7Data.ur (Bemessungsspannung)
-                    (0, parser_utils_1.isNumericI7)(i7Data.udc) ? vsConverter.ratedUdc = i7Data.udc : vsConverter.ratedUdc = i7Data.ur;
+                    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 = i7Data.p_leer / 1000;
+                    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 = 0;
-                    vsConverter.switchingLoss = 0;
+                    vsConverter.resistiveLoss = undefined;
+                    vsConverter.switchingLoss = undefined;
                     /*  csConverter.maxModulationIndex = ;
                         csConverter.maxValveCurrent =  */
                     /** SSH export values */
@@ -2371,6 +2574,7 @@ class ConverterIntegral7 {
                         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
                     }
                     vsConverter.droop = 0; //pu
@@ -2386,20 +2590,43 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`VsConverter ${i7Data.id} ${vsConverter.mrid} besitzt keinen AC Anschluss.`);
                     }
-                    /** Topologie DC Seite*/
-                    const dcNode = new DCNode_1.DCNode(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
+                    /** Topologie DC Seite mit DCGround*/
+                    const dcNode = new DCNode_1.DCNode((0, parser_utils_1.getUUID)(i7Data.guid_dcnodep), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCN']));
                     dcNode.dcEquipmentContainer = dcConverterUnit;
-                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
-                    acDCConverterDCTerminal.dCConductingEquipmentUUID = vsConverter.mrid;
-                    acDCConverterDCTerminal.dcNode = dcNode;
-                    // ist nicht nötig
+                    dcConverterUnit.dCNodes.set(dcNode.getUUID(), dcNode);
+                    const acDCConverterDCTerminal = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_ACDCC-DCT']));
+                    acDCConverterDCTerminal.polarity = DCPolarityKind_1.DCPolarityKind.positive;
+                    acDCConverterDCTerminal.dCConductingEquipment = vsConverter;
                     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), (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), '_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 = 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);
                 }
@@ -2451,8 +2678,8 @@ class ConverterIntegral7 {
                 regulatingControl.targetValue = usoll;
                 regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                 regulatingControl.discrete = false;
-                regulatingControl.enabled = inBetrieb;
-                externalNetworkInjection.controlEnabled = inBetrieb;
+                regulatingControl.enabled = true;
+                externalNetworkInjection.controlEnabled = true;
                 regulatingControl.addRegulatingCondEq(externalNetworkInjection);
                 externalNetworkInjection.regulatingControl = regulatingControl;
                 cimModel.addRegulatingControl(regulatingControl);
@@ -2511,10 +2738,6 @@ class ConverterIntegral7 {
                         cimModel.addMultiplierFactor(mf);
                         externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
                     }
-                    /** TODO
-                     * r, r0 und r2
-                     * x, x0 und x2
-                     * */
                     /** Convert EQ-profile dataset. */
                     const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
                     externalNetworkInjection.maxP = maxP;
@@ -2563,8 +2786,8 @@ class ConverterIntegral7 {
                             regulatingControl.targetValue = usoll;
                             regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
                             regulatingControl.discrete = false;
-                            regulatingControl.enabled = inBetrieb;
-                            externalNetworkInjection.controlEnabled = inBetrieb;
+                            regulatingControl.enabled = true;
+                            externalNetworkInjection.controlEnabled = true;
                             regulatingControl.addRegulatingCondEq(externalNetworkInjection);
                             externalNetworkInjection.regulatingControl = regulatingControl;
                             cimModel.addRegulatingControl(regulatingControl);
@@ -2611,10 +2834,15 @@ class ConverterIntegral7 {
         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;
         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) {
@@ -2893,35 +3121,30 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
+                    const bdf = [];
+                    bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten)));
+                    bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten)));
                     /** Spannungsebene */
-                    const ur = (0, utils_2.getU)(i7Data.ur, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur, this.exportFramesBoundary);
-                    // seriesCompensator.baseVoltage = baseVoltage;
-                    /**
-                     * Längsdrossel ist beschrieben durch:
-                     Un = 10 kV = 10000 V
-                     IrA = 2500
-                     Ukr = 7% = 0,07
-                     Pkr = 0
-            
-                     S = Un(V) * IrA * Wurzel(3) => 43301270,2
-                     Z = Ukr * un^2/IrA (umgerechnet) = 0,161
-                     R = 0, da Pkr = 0
-                     X = Z = 0,161
-                     * */
-                    /** elektrische Parameter */
-                    const ir = (0, parser_utils_1.isNumericI7)(i7Data.ir) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ir) : defaultValuesConfig.SeriesCompensator.varistorRatedCurrent;
-                    const ukr = (0, parser_utils_1.isNumericI7)(i7Data.ukr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ukr) : 0;
-                    if (ir > 0 && ukr > 0) {
-                        const voltage = baseVoltage.nominalVoltage.value * 1000;
-                        const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * ir * Math.sqrt(3));
-                        seriesCompensator.x = z;
-                    }
-                    seriesCompensator.varistorRatedCurrent = ir;
+                    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 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;
+                    seriesCompensator.r = (0, utils_2.calculateRSeriesCompensator)(ir, pkr);
+                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir);
+                    seriesCompensator.varistorPresent = false;
+                    /** EQ-SC */
+                    seriesCompensator.r0 = seriesCompensator.r;
+                    seriesCompensator.x0 = seriesCompensator.x;
                     /** CurrentLimit */
                     const terminal = startTerminal;
                     if (terminal) {
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal.mrid, ir);
+                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
@@ -2929,11 +3152,16 @@ class ConverterIntegral7 {
                     if (!startTerminal.connectivityNode && terminal.connectivityNodeUUID) {
                         startTerminal.connectivityNode = cimModel.getConnectivityNode(terminal.connectivityNodeUUID);
                     }
+                    // Umspannanlage
+                    const substationUUID = this.integralID2UUID.get(i7Data.standort);
                     /** VoltageLevel */
-                    const vlObject = this.determineEquipmentContainer('VoltageLevel', cimModel, cimModel.getObject((_a = startTerminal.connectivityNode) === null || _a === void 0 ? void 0 : _a.getConnectivityNodeContainerUUID()));
+                    const vlObject = this.getVoltageLevelByVoltage((_a = (cimModel.getSubstation(substationUUID))) === null || _a === void 0 ? void 0 : _a.voltageLevels, seriesCompensator.baseVoltage.nominalVoltage.value);
+                    if (!vlObject) {
+                        this.logger.debug(`Längskondensator ${seriesCompensator === null || seriesCompensator === void 0 ? void 0 : seriesCompensator.mrid} hat kein EquipmentContainer`);
+                    }
                     if (vlObject) {
                         seriesCompensator.equipmentContainer = vlObject;
-                        seriesCompensator.baseVoltage = baseVoltage;
+                        //seriesCompensator.baseVoltage = vlObject.baseVoltage;
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
@@ -2982,35 +3210,27 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keinen Zielknoten.`);
                     }
+                    const bdf = [];
+                    bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten)));
+                    bdf.push(this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.eknoten)));
                     /** Spannungsebene */
-                    const ur = (0, utils_2.getU)(i7Data.ur, defaultValuesConfig.DefaultVoltage);
-                    const baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, ur, this.exportFramesBoundary);
-                    // seriesCompensator.baseVoltage = baseVoltage;
-                    /**
-                     * Längskondensator ist beschrieben durch:
-                     Un = 10 kV = 10000 V
-                     IrA = 2500
-                     Ukr = 7% = 0,07
-                     Pkr = 0
-            
-                     S = Un(V) * IrA * Wurzel(3) => 43301270,2
-                     Z = Ukr * un^2/IrA (umgerechnet) = 0,161
-                     R = 0, da Pkr = 0
-                     X = Z = 0,161
-                     * */
-                    /** elektrische Parameter */
-                    const i = (0, parser_utils_1.isNumericI7)(i7Data.ir) ? -1 * (0, parser_utils_1.convertToNumberI7)(i7Data.ir) : undefined;
+                    const baseVoltages = (0, utils_2.getTerminalUn)(cimModel, bdf, seriesCompensator);
+                    seriesCompensator.baseVoltage = baseVoltages[0];
+                    /** EQ */
+                    const ur = (0, utils_2.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;
-                    if (i > 0 && ukr > 0) {
-                        const voltage = baseVoltage.nominalVoltage.value * 1000;
-                        const z = (ukr / 100) * Math.pow(voltage, 2) / (voltage * i * Math.sqrt(3));
-                        seriesCompensator.x = z;
-                    }
-                    seriesCompensator.varistorRatedCurrent = i;
+                    const pkr = (0, parser_utils_1.isNumericI7)(i7Data.pkr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pkr) : undefined;
+                    seriesCompensator.r = (0, utils_2.calculateRSeriesCompensator)(ir, pkr);
+                    seriesCompensator.x = (0, utils_2.calculateXSeriesCompensator)(ur, ukr, ir * -1);
+                    seriesCompensator.varistorPresent = false;
+                    /** EQ-SC */
+                    seriesCompensator.r0 = seriesCompensator.r;
+                    seriesCompensator.x0 = seriesCompensator.x;
                     /** CurrentLimit */
                     const terminal = startTerminal;
                     if (terminal) {
-                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, i);
+                        this.setConductingEquipmentCurrentLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, ir);
                     }
                     else {
                         this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
@@ -3018,14 +3238,13 @@ class ConverterIntegral7 {
                     // Umspannanlage
                     const substationUUID = this.integralID2UUID.get(i7Data.standort);
                     /** VoltageLevel */
-                    const voltageLevel = this.getVoltageLevelByVoltage((_a = (cimModel.getSubstation(substationUUID))) === null || _a === void 0 ? void 0 : _a.voltageLevels, ur);
+                    const voltageLevel = this.getVoltageLevelByVoltage((_a = (cimModel.getSubstation(substationUUID))) === null || _a === void 0 ? void 0 : _a.voltageLevels, seriesCompensator.baseVoltage.nominalVoltage.value);
                     if (!voltageLevel) {
                         this.logger.debug(`Längskondensator ${seriesCompensator === null || seriesCompensator === void 0 ? void 0 : seriesCompensator.mrid} hat kein EquipmentContainer`);
                     }
-                    // const vlUUID = subVlData.find(elem => elem.un === i7Data.ur);
                     if (voltageLevel) {
                         seriesCompensator.equipmentContainer = voltageLevel;
-                        seriesCompensator.baseVoltage = voltageLevel.baseVoltage;
+                        //seriesCompensator.baseVoltage = voltageLevel.baseVoltage;
                     }
                     else {
                         this.logger.debug(`Längskondensator ${i7Data.id} besitzt kein VoltageLevel Ur ${i7Data.ur}.`);
@@ -3466,6 +3685,7 @@ class ConverterIntegral7 {
         });
     }
     convertDCLines(cimModel, integral7, defaultValuesConfig) {
+        var _a;
         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){
@@ -3478,49 +3698,112 @@ class ConverterIntegral7 {
                     //console.log(getUUID(i7Data.guid_dcline));
                     integral7.integralHgueLeitungen.set(i7Data.id, i7Data);
                     const dcLine = new DCLine_1.DCLine((0, parser_utils_1.getUUID)(i7Data.guid_dcline), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCL']));
+                    let dcLineNeg = undefined;
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     /** operationMode der Anfangs- und Zielkopfstation setzen */
-                    const bipol = (0, parser_utils_1.convertToBooleanI7)(i7Data.bipol);
+                    let converterStart = false;
+                    let converterStartNeg = false;
+                    let converterUnitStartSide = false;
+                    let converterTarget = false;
+                    let converterTargetNeg = false;
+                    let converterUnitTargetSide = false;
+                    let bipol = (0, parser_utils_1.convertToBooleanI7)(i7Data.bipol);
+                    bipol = (0, parser_utils_1.convertToBooleanI7)(false);
                     //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), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
-                    /* TODO
-                    dcLineSegment.length = keine Informationen vorhanden
-                    dcLineSegment.capacitance = keine Informationen vorhanden
-                    dcLineSegment.inductance = keine Informationen vorhanden
-                    */
-                    dcLineSegment.resistance = i7Data.rdc / 2;
+                    let dcLineSegmentNeg = undefined;
+                    if (dcLineSegment.getUUID() === "579b6a04-23c5-452f-b7ad-db283dad1cdb") {
+                        const stop = true;
+                    }
+                    /**EQ: not given directly by the INTEGRAL system model */
+                    dcLineSegment.length = undefined;
+                    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.equipmentContainer = dcLine;
+                    //create second dcLineSegment in case this dcLine is a bipol.
+                    if (bipol) {
+                        dcLineNeg = new DCLine_1.DCLine(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCL']));
+                        dcLineSegmentNeg = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidn), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
+                        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.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;
-                    // TODO BEGIN: Remove me after HGUE-Knoten (netz_hgueknoten) will be exported/converted
-                    if (acDCConverterStart === undefined || acDCConverterTarget === undefined) {
-                        continue;
+                    converterStart = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTarget !== undefined);
+                    let acDCConverterTargetNeg = 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;
+                        converterStartNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterStartNeg !== undefined);
+                        acDCConverterTargetNeg = converterTarget && int7hguekopf !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopf, acDCConverterTarget.constructor.name, acDCConverterTarget) : undefined;
+                        converterTargetNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTargetNeg !== undefined);
+                    }
+                    if (converterStart && !converterStartNeg) {
+                        createDCGround(acDCConverterStart);
+                    }
+                    else if (converterStart && converterStartNeg) {
+                        createDCGround(acDCConverterStart);
+                        connectDCGround(acDCConverterStartNeg);
                     }
-                    // TODO END: Remove me after HGUE-Knoten (netz_hgueknoten) will be exported/converted
                     const converterUnitStart = acDCConverterStart.equipmentContainer ? acDCConverterStart.equipmentContainer : undefined;
+                    converterUnitStartSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitStart !== undefined);
                     const converterUnitTarget = acDCConverterTarget.equipmentContainer ? acDCConverterTarget.equipmentContainer : undefined;
-                    if (converterUnitStart && converterUnitTarget) {
-                        switch (bipol) {
-                            case (true): {
+                    converterUnitTargetSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitTarget !== undefined);
+                    switch (bipol) {
+                        case true: {
+                            if (converterUnitStartSide && !converterUnitTargetSide) {
+                                converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
+                                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.bipolar;
                                 converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
-                                break;
+                                if (converterTarget && !converterTargetNeg) {
+                                    createDCGround(acDCConverterTarget);
+                                }
+                                else if (converterTarget && converterTargetNeg) {
+                                    createDCGround(acDCConverterTarget);
+                                    connectDCGround(acDCConverterTargetNeg);
+                                }
+                                else {
+                                    this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r ACDCConverter konnte nicht ermittelt werden.`);
+                                }
+                            }
+                            else {
+                                this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r DCConverterUnit's konnten nicht ermittelt werden.`);
                             }
-                            default: {
+                            break;
+                        }
+                        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;
                             }
                         }
-                    }
-                    else {
-                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r Konverter konnte nicht ermittelt werden.`);
+                        default: {
+                            this.logger.error(`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;
                     if (startDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
+                        const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)('i7Data.guid_dcterminalp'), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
                         dcTerminal.connected = true;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = startDCNode;
@@ -3530,9 +3813,21 @@ class ConverterIntegral7 {
                     else {
                         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;
+                        dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
+                        dcTerminal.dcNode = startDCNodeNeg;
+                        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;
                     if (targetDCNode) {
-                        const dcTerminal = new DCTerminal_1.DCTerminal(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
+                        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;
                         dcTerminal.dCConductingEquipment = dcLineSegment;
                         dcTerminal.dcNode = targetDCNode;
@@ -3542,8 +3837,23 @@ class ConverterIntegral7 {
                     else {
                         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;
+                        dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
+                        dcTerminal.dcNode = targetDCNodeNeg;
+                        targetDCNodeNeg.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
+                        cimModel.addDCTerminal(dcTerminal);
+                    }
+                    else {
+                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten NEG. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
+                    }
                     cimModel.addDCLine(dcLine);
                     cimModel.addDCLineSegment(dcLineSegment);
+                    if (bipol) {
+                        cimModel.addDCLine(dcLineNeg);
+                        cimModel.addDCLineSegment(dcLineSegmentNeg);
+                    }
                     this.addIdMapping(i7Data.id, dcLineSegment.mrid, integral_sql_1.Integral7TableNames.HGUE_LEITUNG);
                 }
             }
@@ -3564,7 +3874,7 @@ class ConverterIntegral7 {
                     typTrafo.ukr12 = i7Data.ukr;
                     typTrafo.pkr12 = i7Data.pkr;
                     typTrafo.schaltgruppe = i7Data.schaltgr;
-                    typTrafo.spezialRegelung = i7Data.trafo_spezial;
+                    typTrafo.spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? (0, parser_utils_1.convertToNumberI7)(i7Data.trafo_spezial) : undefined;
                     typTrafo.x00r1 = i7Data.x00r1;
                     typTrafo.x00r2 = i7Data.x00r2;
                     typTrafo.x0kr1 = i7Data.x0kr1;
@@ -3710,7 +4020,7 @@ class ConverterIntegral7 {
                     sternpunktKnotenMap.set(elem, new Map());
                 }
                 if (this.isTableAvailable(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN) && trafoIDs.length) {
-                    const sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), trafoIDs));
+                    const sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN_FILTERED, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.STERNPUNKT_KNOTEN), trafoIDs));
                     for (const spKnoten of sternpunktKnotenResult) {
                         (_a = sternpunktKnotenMap.get(spKnoten.netzobjekt)) === null || _a === void 0 ? void 0 : _a.set(spKnoten.id, spKnoten);
                     }
@@ -3725,6 +4035,27 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
+                    if (powerTransformer.getUUID() === '515508dc-5982-4686-ad26-08d39db91421') {
+                        let stop = true;
+                    } // kein Typ in D4
+                    if (powerTransformer.getUUID() === '012416f2d9584971baa93360fcf40be2') {
+                        let stop = true;
+                    } //Typ in D8
+                    if (powerTransformer.getUUID() === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') {
+                        let stop = true;
+                    } //kein Typ in BE
+                    if (powerTransformer.getUUID() === '11e7be86-8bb7-41ba-898a-74cd5e8efbb9') {
+                        let stop = true;
+                    } //Typ in D7
+                    if (powerTransformer.getUUID() === '8eca3fedd32c49369f8946ac4ce70e17') { //Stufenstellerkonvertierung fehlgeschlagen
+                        let stop = true;
+                    }
+                    if (powerTransformer.getUUID() === 'b9d8bd48e1554af7b6153c1f7da052e1') {
+                        let stop = true;
+                    } //Phasenschieber zu falscher Winkel und falsches stepIncrement.
+                    if (powerTransformer.getUUID() === '2ACF34B9-9DC9-4607-9B8A-032EBC2C31A5') {
+                        let stop = true;
+                    } //Längsregeltransformator mit symmetrischem Phasenschieber.
                     if (i7Data.nametyp) {
                         const stop = true;
                     }
@@ -3739,7 +4070,7 @@ class ConverterIntegral7 {
                     }
                     const schaltgruppe = ((_b = i7Data.schaltgr) === null || _b === void 0 ? void 0 : _b.length) ? i7Data.schaltgr : powerTransformerInfo === null || powerTransformerInfo === void 0 ? void 0 : powerTransformerInfo.schaltgruppe;
                     // Wicklung 1
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1), `W1${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     const pkr = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '');
                     const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '');
@@ -3747,15 +4078,14 @@ class ConverterIntegral7 {
                     const ur = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
                     //const x0 = get
                     // I rated
-                    const ir1 = sr * 1000000 / (ur * 1000 * Math.sqrt(3));
+                    const ir1 = (0, utils_2.getTrafoIr)(ur, sr);
                     // P0 Lastverluste im I7 Modell p_leer
                     const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
                     // Leerlaufverluste
                     const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
-                    //const zeroSequImpedanzWx = calculate;
                     // Berechnung
                     powerTransformerEnd1.r = (0, utils_2.calculateR)(ur, pkr, sr);
-                    powerTransformerEnd1.x = (0, utils_2.calculateX)(ur, ukr, sr, powerTransformerEnd1.r);
+                    powerTransformerEnd1.x = (0, utils_2.calculateX)(ur, ukr, sr);
                     // TODO was ist P0 in I7 Trafomodell
                     // P0 Lastverluste abhängig von Last
                     powerTransformerEnd1.g = (0, utils_2.calculateG)(ur, pLeer);
@@ -3763,8 +4093,10 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
                     //Short-Circuit data export EQ-SC profile //TODO: Read data for enervancetransformertype object.
-                    powerTransformerEnd1.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
-                    powerTransformerEnd1.r0 = (0, parser_utils_1.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
+                    const x00r1 = (0, parser_utils_1.isNumericI7)(i7Data.x00r1) ? i7Data.x00r1 : 0;
+                    const x0kr1 = (0, parser_utils_1.isNumericI7)(i7Data.x0kr1) ? i7Data.x0kr1 : 0;
+                    const x00r2 = (0, parser_utils_1.isNumericI7)(i7Data.x00r2) ? i7Data.x00r2 : 0;
+                    const r00r1 = (0, parser_utils_1.isNumericI7)(i7Data.r00r1) ? i7Data.r00r1 : 0;
                     /** Topologie 3 moegliche Anschluesse
                      *  KontenSo -> Anschluesspunkt
                      *  KnotenSf -> Schaltfeldpunkt
@@ -3786,15 +4118,21 @@ class ConverterIntegral7 {
                         }
                     }
                     // Wicklung 2
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w2), `W2${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w2), `W2-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
                     const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
                     // Berechnung
+                    // NullSystem Impedanzen (nur Reaktanzen)
+                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo2W)(r00r1, x00r1, x0kr1, x00r2, ur, ur2);
                     powerTransformerEnd2.r = 0;
                     powerTransformerEnd2.x = 0;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
+                    powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
+                    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));
@@ -3834,17 +4172,25 @@ class ConverterIntegral7 {
                      * */
                     const powerTransformerEnds = [powerTransformer.powerTransformerEnd[0], powerTransformer.powerTransformerEnd[1]];
                     /** Id des spannungsgeregelten Kontens */
-                    const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
+                    const spRegKnoten = yield this.getSpannungsbandTrafo(i7Data, powerTransformerEnds);
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
+                    /*if(spRegKnoten.id > -1){
+                      spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
+                    }*/
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
+                    /** Create TapChanger for PowerTransformerEnds */
                     try {
+                        if (connectivityNode === undefined) {
+                            let stop = true;
+                        }
                         this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
                     }
                     catch (err) {
-                        console.log('convertTapChangers');
-                        console.log(err);
+                        this.logger.error(`Fehler aufgetreten. Konvertierung des Stufenstellers für Transformator mit UUID ${powerTransformer.getUUID()} fehlgeschlagen.`);
                     }
+                    /** Transformator Anschlusspunkte nach Spannungsebene sortieren */
+                    this.sortTransformerEnd(powerTransformer, 'ratedU', 'desc');
                     cimModel.addPowerTransformerEnd(powerTransformerEnd1);
                     cimModel.addPowerTransformerEnd(powerTransformerEnd2);
                     cimModel.addPowerTransformer(powerTransformer);
@@ -3879,7 +4225,7 @@ class ConverterIntegral7 {
                 /** Sternpunktknoten */
                 let sternpunktKnotenResult;
                 if (this.isTableAvailable(tableNameStpKnoten) && trafoWicklungIDs.length > 0) {
-                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN, this.getAvailableColumnNames(tableNameStpKnoten), trafoWicklungIDs));
+                    sternpunktKnotenResult = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STERNPUNKT_KNOTEN_FILTERED, this.getAvailableColumnNames(tableNameStpKnoten), trafoWicklungIDs));
                 }
                 for (const i7Data of result) {
                     const sternpunktKnotenMap = new Map();
@@ -3935,8 +4281,8 @@ class ConverterIntegral7 {
                     const impedanzW2 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
                     const impedanzW3 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
                     // NullSystem Impedanzen (nur Reaktanzen)
-                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo3W)(r00r1, r0kr1, r00r2, x00r1, x0kr1, x00r2, ur1, ur2, sr1);
-                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1), `W1 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const zeroSequImpedanzWx = (0, utils_trafo3w_1.calculateZeroSequImpedanzenTrafo3W)(r00r1, r0kr1, r00r2, x00r1, x0kr1, x00r2, ur1, ur2, ur3);
+                    const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     // Topologie
                     /** Anfang
@@ -3975,6 +4321,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.g = impedanzW1.g;
                     powerTransformerEnd1.b = impedanzW1.b;
                     powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
+                    powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
                     powerTransformerEnd1.ratedU = ur1;
                     powerTransformerEnd1.ratedS = sr1;
                     this.setPowerTransformerEndProperties(frame, powerTransformerEnd1, powerTransformer, terminal1, sternpunktKnotenMap, integral7, ir1, i7Data, defaultValuesConfig, trafoWicklungen);
@@ -4015,7 +4362,7 @@ class ConverterIntegral7 {
                     const terminal2 = this.createBoundaryConnection(frame, powerTransformer, wicklung2.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal2)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w2), `W2 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w2), `W2-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     // Berechnung
                     powerTransformerEnd2.r = impedanzW2.r;
@@ -4023,6 +4370,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd2.g = impedanzW2.g;
                     powerTransformerEnd2.b = impedanzW2.b;
                     powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
+                    powerTransformerEnd2.r0 = zeroSequImpedanzWx.r02;
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     powerTransformerEnd2.powerTransformer = powerTransformer;
@@ -4064,7 +4412,7 @@ class ConverterIntegral7 {
                     const terminal3 = this.createBoundaryConnection(frame, powerTransformer, wicklung3.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (!terminal3)
                         this.logger.debug(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} besitzt keinen Anfangsknoten.`);
-                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w3), `Wicklung 3 ${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
+                    const powerTransformerEnd3 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w3), `W3-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd3.endNumber = 3;
                     // Berechnung
                     powerTransformerEnd3.r = impedanzW3.r;
@@ -4072,6 +4420,7 @@ class ConverterIntegral7 {
                     powerTransformerEnd3.g = impedanzW3.g;
                     powerTransformerEnd3.b = impedanzW3.b;
                     powerTransformerEnd3.x0 = zeroSequImpedanzWx.x03;
+                    powerTransformerEnd3.r0 = zeroSequImpedanzWx.r03;
                     powerTransformerEnd3.ratedS = sr3;
                     powerTransformerEnd3.ratedU = ur3;
                     powerTransformerEnd3.powerTransformer = powerTransformer;
@@ -4113,10 +4462,13 @@ class ConverterIntegral7 {
                     /** Normieren auf die Wicklungsnummer, da 0 obere Spannungsseite angibt */
                     // const terminals = [terminal1, terminal2, terminal3];
                     const powerTransformerEnds = [powerTransformerEnd1, powerTransformerEnd2, powerTransformerEnd3];
-                    const spRegKnoten = yield this.getSpannungsbandTrafo2W(i7Data);
+                    const spRegKnoten = yield this.getSpannungsbandTrafo(i7Data, powerTransformerEnds);
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
+                    if (cnUUID !== undefined) {
+                        const stop = true;
+                    }
                     try {
                         this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
                     }
@@ -4149,15 +4501,15 @@ class ConverterIntegral7 {
         const winkel = `uzus_winkel_s${endNumber}`;
         const ur = `ur${endNumber}`;
         powerTransformerEndInfo.endNumber = endNumber;
-        powerTransformerEndInfo.ratedU = new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V);
-        powerTransformerEndInfo.gestufteSeite = (0, parser_utils_1.convertToNumberI7)(data[gestufteSeite]);
+        powerTransformerEndInfo.ratedU = (0, parser_utils_1.isNumericI7)(data[ur]) ? new Voltage_1.Voltage(data[ur], UnitMultiplier_1.UnitMultiplier.k, UnitSymbol_1.UnitSymbol.V) : undefined;
+        powerTransformerEndInfo.gestufteSeite = (0, parser_utils_1.isNumericI7)(data[gestufteSeite]) ? (0, parser_utils_1.convertToNumberI7)(data[gestufteSeite]) : undefined;
         const tapChangerInfo = new EVTapChangerInfo_1.EVTapChangerInfo(common_utils_1.CommonUtils.generateUUID(), `TapChangerInfo_${data['id']}`);
-        tapChangerInfo.highStep = (0, parser_utils_1.convertToNumberI7)(data[maxstufe]);
-        tapChangerInfo.lowStep = (0, parser_utils_1.convertToNumberI7)(data[minstufe]);
-        tapChangerInfo.neutralStep = (0, parser_utils_1.convertToNumberI7)(data[neutralstufe]);
+        tapChangerInfo.highStep = (0, parser_utils_1.isNumericI7)(data[maxstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[maxstufe]) : undefined;
+        tapChangerInfo.lowStep = (0, parser_utils_1.isNumericI7)(data[minstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[minstufe]) : undefined;
+        tapChangerInfo.neutralStep = (0, parser_utils_1.isNumericI7)(data[neutralstufe]) ? (0, parser_utils_1.convertToNumberI7)(data[neutralstufe]) : undefined;
         tapChangerInfo.stepPhaseIncrement = (0, parser_utils_1.isNumericI7)(data[winkel]) ? new AngleDegrees_1.AngleDegrees(data[winkel], UnitMultiplier_1.UnitMultiplier.none, UnitSymbol_1.UnitSymbol.deg) : undefined;
-        tapChangerInfo.uMax = data[umax];
-        tapChangerInfo.uMin = data[umin];
+        tapChangerInfo.uMax = (0, parser_utils_1.isNumericI7)(data[umax]) ? (0, parser_utils_1.convertToNumberI7)(data[umax]) : undefined;
+        tapChangerInfo.uMin = (0, parser_utils_1.isNumericI7)(data[umin]) ? (0, parser_utils_1.convertToNumberI7)(data[umin]) : undefined;
         tapChangerInfo.setPowerTransfomerEndInfo(powerTransformerEndInfo);
         powerTransformerEndInfo.setTapChangerInfo(tapChangerInfo);
     }
@@ -4696,7 +5048,7 @@ class ConverterIntegral7 {
         }
         return ret_val;
     }
-    getSpannungsbandTrafo2W(i7Data) {
+    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* () {
                 let minMaxSollResult;
@@ -4707,11 +5059,11 @@ class ConverterIntegral7 {
                  * 2 - Niederspannungsseite (Anschluss 3)
                  * 3 - Externer Knoten
                  * */
-                /** Normieren auf die Wicklungsnummer, da 0 obere Spannungsseite angibt */
-                const spgKnotenId = i7Data.spgreg_knoten;
-                let tempKnotenId = i7Data.spgreg_anschluss === 0 ? i7Data.aknoten :
-                    (i7Data.spgreg_anschluss === 1 ? i7Data.eknoten : undefined);
-                if (tempKnotenId !== undefined) { // Lokale Regelung
+                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;
+                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.
                     // 3 Faelle:
                     // 1. KnotenSf -> Schaltfeldpunkt
@@ -4764,25 +5116,25 @@ class ConverterIntegral7 {
                         }
                     }
                 }
-                else if (spgKnotenId !== undefined) { // Reeleung am externen Knoten
+                else if (i7Data.spgreg_anschluss === 3 && tempKnotenId !== undefined) { // Regelung am externen Knoten
                     const tabName_NetzSo = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.KNOTEN_SO];
                     const tabName_NetzSSAB = integral_sql_1.Integral7TableNames[integral_sql_1.I7Objects.SAMMELSCHIENE];
                     const query = ` SELECT Voltage.id, Voltage.umin, Voltage.umax, Voltage.usoll
                         FROM (
                                  SELECT id, umin, umax, usoll
                                  FROM ${tabName_NetzSo}
-                                 WHERE ${tabName_NetzSo}.id = ${spgKnotenId}
+                                 WHERE ${tabName_NetzSo}.id = ${tempKnotenId}
                                  UNION
                                  SELECT id, umin, umax, usoll
                                  FROM ${tabName_NetzSSAB}
-                                 WHERE ${tabName_NetzSSAB}.id = ${spgKnotenId}) as Voltage`;
+                                 WHERE ${tabName_NetzSSAB}.id = ${tempKnotenId}) as Voltage`;
                     minMaxSollResult = yield this.mysqlController.execQuery(query);
                 }
                 if (minMaxSollResult && minMaxSollResult.length) {
                     resolve(minMaxSollResult[0]);
                 }
                 else {
-                    resolve({ id: 0, usoll: 0, umin: 0, umax: 0 });
+                    resolve({ id: -1, usoll: 0, umin: 0, umax: 0 });
                 }
             }));
         });
@@ -5031,13 +5383,13 @@ class ConverterIntegral7 {
         cimModel.addCoordinateSystem(coordinateSystem);
     }
     setPowerTransformerEndProperties(frame, powerTransformerEnd, powerTransformer, terminal, sternpunktKnotenMap, integral7, ir, 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);
-            let obj = i7Data;
             let isTrafo2w = i7Data.trafowicklung3w3 === undefined ? true : false;
             // Erdung / Sternpunkt
             if (sternpunktKnotenMap.has(i7Data.id) && isTrafo2w) {
@@ -5077,7 +5429,10 @@ class ConverterIntegral7 {
             this.logger.debug(`Wicklung2W ${i7Data.id} ${powerTransformerEnd.endNumber} ${powerTransformerEnd.mrid} keine Terminalinstanz.`);
         }
         // Spannungsebene
-        if (powerTransformerEnd.ratedU) {
+        if ((_b = (_a = powerTransformerEnd === null || powerTransformerEnd === void 0 ? void 0 : powerTransformerEnd.terminal) === null || _a === void 0 ? void 0 : _a.connectivityNode) === null || _b === void 0 ? void 0 : _b.getBaseVoltage()) {
+            powerTransformerEnd.baseVoltage = powerTransformerEnd.terminal.connectivityNode.getBaseVoltage();
+        }
+        else if (powerTransformerEnd.ratedU) {
             powerTransformerEnd.baseVoltage = (0, util_create_1.createBaseVoltageIfNotExists)(cimModel, powerTransformerEnd.ratedU, this.exportFramesBoundary);
         }
         else {
@@ -5087,53 +5442,119 @@ class ConverterIntegral7 {
         powerTransformer.addPowerTransformerEnd(powerTransformerEnd);
     }
     convertTapChangers(i7Data, transformerEnds, cimModel, transformerinfo, connectivityNode, spannungsband) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        /*if(getUUID(i7Data.guid) === '11e7be86-8bb7-41ba-898a-74cd5e8efbb9'){ //Zeile50
+          let stop = true; DONE
+        }
+        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)=== 'CFDAA56A-A0DA-4C5B-92CC-21138B6D6D07'){ //Standard LR
+          let stop = true;
+        }*/
+        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '00ebe00e-50fa-4fc0-9ed6-557528a9b460') { //Zeile53 - Typ Meeden'
+            let stop = true;
+        }
+        /*if(getUUID(i7Data.guid) === '012416f2d9584971baa93360fcf40be2'){ //Zeile55 - SR statt LR'
+          let stop = true;
+        }*/
+        if ((0, parser_utils_1.getUUID)(i7Data.guid) === '515508dc-5982-4686-ad26-08d39db91421') { //Zeile81 - SR statt LR'
+            let stop = true;
+        }
+        /*if(getUUID(i7Data.guid) === '5ec82d14-ee64-43b6-86ff-c7615d96f7ad'){ //Zeile58
+          let stop = true;
+        }*/
+        let ratioPhaseTapChangerPresent = false;
+        //Check if tap changer exists. (power transformer winding)
+        let tapChangerNumberI7 = []; //Number of tap changer
+        let tapChangerNumber = [];
+        //let transformerEndInfo:EVPowerTransformerEndInfo[] = [];
+        for (let tapChangerPos = 1; tapChangerPos <= 2; tapChangerPos++) {
+            if ((0, parser_utils_1.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerPos}`])) {
+                tapChangerNumberI7.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
+                tapChangerNumber.push(i7Data[`gestufte_seite_s${tapChangerPos}`]);
+            }
+        }
+        //collect information about tap changers (type)
+        if (tapChangerNumberI7.length === 0) {
+            for (let endNumber = 1; endNumber <= transformerEnds.length; endNumber++) {
+                if ((0, parser_utils_1.isNumericI7)((_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === endNumber).gestufteSeite)) {
+                    tapChangerNumberI7.push((_b = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _b === void 0 ? void 0 : _b.find(elem => elem.endNumber === endNumber).gestufteSeite);
+                    tapChangerNumber.push((_c = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _c === void 0 ? void 0 : _c.find(elem => elem.endNumber === endNumber).gestufteSeite);
+                }
+            }
+        }
+        //If there is a phase tap changer and a ratio tap changer reorder the tap changers to process ratio tap changer first.
+        let index = undefined;
+        if (tapChangerNumberI7.length > 1) {
+            for (let entry of tapChangerNumberI7) {
+                const spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
+                const transformerEndInfo = (_d = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _d === void 0 ? void 0 : _d.find(elem => elem.endNumber === entry);
+                const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
+                const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${entry}`])
+                    ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${entry}`])
+                    : (_e = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _e === void 0 ? void 0 : _e.value;
+                if (!((0, parser_utils_1.isNumericI7)(angle) && (0, parser_utils_1.convertToNumberI7)(angle) != 0 || spezialRegelung) && tapChangerNumberI7.indexOf(entry) > 0) {
+                    index = tapChangerNumberI7.indexOf(entry);
+                    ratioPhaseTapChangerPresent = true;
+                }
+            }
+        }
+        if (index > 0) {
+            tapChangerNumber[0] = tapChangerNumberI7[index];
+            tapChangerNumber[1] = tapChangerNumberI7[0];
+        }
         /** I7 Modell max. 2 Stufenschalter */
-        for (let tapChangerNumber = 1; tapChangerNumber <= 2; tapChangerNumber++) {
+        for (let entry of tapChangerNumber) {
             /**
-             * 0 - obere Spannungsseite (Anschluss 1)
-             * 1 - obere Spannungsseite (Anschluss 1)
-             * 2 - mittlere Spannungsseite (Anschluss 1)
-             * 3 - Niederspannungsseite (Anschluss 2)
-             * ? - Externer Knoten  (Anschluss 3)
-             * */
-            // gestufte Wicklung
-            const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
-            const transformerEnd = transformerEnds.find(elem => elem.endNumber === tapChangerNumber);
-            let gestufteSeite = (0, parser_utils_1.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerNumber}`])
-                ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
-                : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
-            if ((0, parser_utils_1.isNumericI7)(gestufteSeite))
-                gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
+             * 0  Oberspannungsseite
+             * 1  Seite 1
+             * 2  Seite 2
+             * -  Stufenschalter nicht vorhanden
+             */
+            let entryI7 = tapChangerNumberI7.indexOf(entry) + 1;
+            let gestufteSeite = tapChangerNumberI7[entryI7 - 1];
+            const transformerEndInfo = (_f = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _f === void 0 ? void 0 : _f.find(elem => elem.endNumber === entryI7);
+            const transformerEnd = transformerEnds.find(elem => elem.endNumber === entryI7);
+            if ((0, parser_utils_1.isNumericI7)(gestufteSeite)) {
+                if (gestufteSeite === 0) { //'Oberspannungsseite'
+                    gestufteSeite = transformerEnds.sort(function (w1, w2) {
+                        return w2['desc'] - w1['desc'];
+                    })[0].endNumber;
+                    ;
+                }
+            }
             if (!transformerEnd) {
                 this.logger.error(`Trafo ${i7Data.id}: Zum Stufenschalter ${gestufteSeite} keine Wicklung gefunden.`);
                 continue;
             }
             else if (!gestufteSeite) {
-                this.logger.error(`Trafo ${i7Data.id}: Kein Stufenschalter ${gestufteSeite} zur Wicklung ${transformerEnd.getUUID()} an Transformator ${(_b = transformerEnd.powerTransformer) === null || _b === void 0 ? void 0 : _b.getUUID()} gefunden.`);
+                this.logger.error(`Trafo ${i7Data.id}: Kein Stufenschalter ${gestufteSeite} zur Wicklung ${transformerEnd.getUUID()} an Transformator ${(_g = transformerEnd.powerTransformer) === null || _g === void 0 ? void 0 : _g.getUUID()} gefunden.`);
                 continue;
             }
             const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-            const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
-                ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
-                : (_c = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _c === void 0 ? void 0 : _c.value;
-            const neutralU = transformerEnd.ratedU;
-            let tapChanger;
-            if (isFinite(angle) && angle !== 0) {
+            const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${entryI7}`])
+                ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${entryI7}`])
+                : (_h = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _h === void 0 ? void 0 : _h.value;
+            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
-                tapChanger = this.createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber, transformerinfo);
+                tapChanger = this.createPhaseTapChanger(i7Data, transformerEnds, cimModel, gestufteSeite, entryI7, transformerinfo);
             }
             else {
                 // Winkel ist nicht definiert => Längsregler/RatioTapChanger
-                tapChanger = this.createRatioTapChanger(i7Data, transformerEnd, cimModel, connectivityNode, tapChangerNumber, spannungsband, transformerinfo);
+                tapChanger = this.createRatioTapChanger(i7Data, transformerEnds, cimModel, connectivityNode, gestufteSeite, entryI7, spannungsband, transformerinfo);
             }
             // Stufen
-            this.setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, tapChangerInfo);
-            tapChanger.transformerEnd = transformerEnd;
-            tapChanger.neutralU = neutralU;
+            this.setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, entryI7, ratioPhaseTapChangerPresent, tapChangerInfo);
+            let stop = true;
         }
+        let stop = true;
     }
-    setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, tapChangerInfo) {
+    setTapChangerVoltageProperties(i7Data, cimModel, tapChanger, tapChangerNumber, ratioPhaseTapChangerPresent, tapChangerInfo) {
+        var _a;
         let lowStep = (0, parser_utils_1.isNumericI7)(i7Data[`minstufe_s${tapChangerNumber}`])
             ? i7Data[`minstufe_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.lowStep;
@@ -5146,40 +5567,44 @@ class ConverterIntegral7 {
         let currentStep = (0, parser_utils_1.isNumericI7)(i7Data[`aktstufe_s${tapChangerNumber}`])
             ? i7Data[`aktstufe_s${tapChangerNumber}`]
             : neutralStep;
+        const angle = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+            ? (0, parser_utils_1.convertToNumberI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
+            : (_a = tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement) === null || _a === void 0 ? void 0 : _a.value;
         const i7TapArray = (0, utils_2.getTapChangerStepArray)(lowStep, highStep);
         /*    const tapStepCount = i7TapArray.length;
             const neutralStepIndex = i7TapArray.indexOf(neutralStep);*/
         const lowerVoltageStepCount = (0, utils_2.getTapChangerStepCount)(lowStep, neutralStep);
-        const increaseVoltageStepCount = (0, utils_2.getTapChangerStepCount)(neutralStep, highStep);
+        const upperVoltageStepCount = (0, utils_2.getTapChangerStepCount)(neutralStep, highStep);
         const 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}`])
             ? i7Data[`umax_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.uMax;
-        const lowerVoltageStepIncrement = Math.abs(uMin) / lowerVoltageStepCount * -1; // -0.01778 => -1.78%
-        let increaseVoltageStepIncrement = Math.abs(uMax) / increaseVoltageStepCount; // 0.01778 => 1.78%
-        increaseVoltageStepIncrement = isNaN(increaseVoltageStepIncrement) ? 1 : increaseVoltageStepIncrement;
+        let lowerVoltageStepIncrement = 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(increaseVoltageStepIncrement)) {
+            if (Math.abs(lowerVoltageStepIncrement) !== Math.abs(upperVoltageStepIncrement) || uMax < uMin || ratioPhaseTapChangerPresent) {
                 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 < lowerVoltageStepCount; i++) {
-                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i + 1, (lowerVoltageStepIncrement * (lowerVoltageStepCount - i)));
+                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;
                 }
                 // neutral Step
-                (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, lowerVoltageStepCount + 1, 1);
+                step_tmp++;
+                (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, i7TapArray[step_tmp], 1);
+                step_tmp++;
+                start_step_tmp = step_tmp;
                 // Spannung erhoehen
-                for (let i = 0; i < increaseVoltageStepCount; i++) {
-                    const step = (lowerVoltageStepCount + 1) + (i + 1);
-                    (0, util_create_1.createRatioTapChangerTablePoint)(ratioTapChangerTable, step, (increaseVoltageStepIncrement * (i + 1)));
-                }
-                lowStep = 1;
-                highStep = ratioTapChangerTable.ratioTapChangerTablePoints.length;
-                neutralStep = i7TapArray.indexOf(neutralStep) + 1;
-                currentStep = neutralStep;
+                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
@@ -5188,21 +5613,25 @@ class ConverterIntegral7 {
             }
             ratioTapChanger.stepVoltageIncrement = increaseVoltageStepIncrement;
         }
-        if (tapChanger instanceof PhaseTapChangerNonLinear_1.PhaseTapChangerNonLinear)
+        if (tapChanger instanceof PhaseTapChangerNonLinear_1.PhaseTapChangerNonLinear) {
             tapChanger.voltageStepIncrement = increaseVoltageStepIncrement;
+        }
+        else if (tapChanger instanceof PhaseTapChangerLinear_1.PhaseTapChangerLinear) {
+            tapChanger.stepPhaseShiftIncrement = angle / upperVoltageStepCount; //upperVoltageStepCount is equal to lowerVoltageStepCount
+        }
         tapChanger.lowStep = lowStep;
         tapChanger.highStep = highStep;
         tapChanger.neutralStep = neutralStep;
-        tapChanger.normalStep = neutralStep;
+        tapChanger.normalStep = currentStep;
         tapChanger.step = currentStep;
         if (Math.abs(lowerVoltageStepIncrement) !== Math.abs(increaseVoltageStepIncrement)) {
-            this.logger.error(`Trafo ${i7Data.id}: Zusatzspannung Min/Max sind nicht symmetrisch  MIN ${lowerVoltageStepIncrement} MAX ${increaseVoltageStepIncrement}. Das Attribut voltageStepIncrement i.H.v ${increaseVoltageStepIncrement} könnte inkorrekt sein.`);
+            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.`);
         }
     }
-    createRatioTapChanger(i7Data, transformerEnd, cimModel, regulatingConnectivityNode, tapChangerNumber, spannungsband, transformerinfo) {
-        var _a, _b, _c;
-        const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
-        const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
+    createRatioTapChanger(i7Data, transformerEnds, cimModel, regulatingConnectivityNode, gestufteSeite, tapChangerNumber, spannungsband, transformerinfo) {
+        var _a, _b;
+        const transformerEnd = transformerEnds[gestufteSeite - 1];
+        // const tapChangerInfo = transformerEndInfo?.tapChangerInfo;
         // ist ein Stufenschalter vorhanden?
         /**
          * 0 - obere Spannungsseite (Anschluss 1)
@@ -5212,42 +5641,40 @@ class ConverterIntegral7 {
          * ? - Externer Knoten  (Anschluss 3)
          * */
         /** Regelung */
-        /** Normieren auf die Wicklungsnummer, da 0 obere Spannungsseite ist */
-        let gestufteSeite = (0, parser_utils_1.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerNumber}`])
-            ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
-            : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
-        // Normieren
-        gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
-        const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger(common_utils_1.CommonUtils.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-        ratioTapChanger.ltcFlag = false;
+        const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+        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;
+        //transformerEnd.ratioTapChanger = ratioTapChanger;
         ratioTapChanger.neutralU = transformerEnd.ratedU;
         ratioTapChanger.tculControlMode = TransformerControlMode_1.TransformerControlMode.volt;
-        const regelung = +i7Data[`regelung_s${gestufteSeite}`];
-        // TODO
-        const regulatingTerminal = ((_b = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _b === void 0 ? void 0 : _b.size) ? [...(_c = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _c === void 0 ? void 0 : _c.values()].find(elem => elem.connected) : undefined;
+        const regelung = (0, parser_utils_1.isNumericI7)(i7Data[`regelung_s${tapChangerNumber}`]) ? (0, parser_utils_1.convertToNumberI7)(i7Data[`regelung_s${tapChangerNumber}`]) : undefined;
+        const regulatingTerminal = ((_a = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _a === void 0 ? void 0 : _a.size) ? [...(_b = regulatingConnectivityNode === null || regulatingConnectivityNode === void 0 ? void 0 : regulatingConnectivityNode.terminals) === null || _b === void 0 ? void 0 : _b.values()].find(elem => elem.connected) : undefined;
         if (isFinite(spannungsband === null || spannungsband === void 0 ? void 0 : spannungsband.usoll) && regulatingTerminal) {
             /** Ausprägungen
              * 0 -> keine automatische Stufung
              * 1 -> Spannungsbetragsregelung
              * 2 -> Wirkflussvorgabe
              * 3 -> Stromkompoundierung ->  stromabhängige Spannungsregelung
-             * 4 -> Blindleitungsbilazierung
+             * 4 -> Blindleistungsbilazierung
              * */
-            /**
-             * Spezieller Fall:
-             * Trafo3W mit Winkelangabe und kein Typ Helmstedt angegeben => mappe auf den asymetrischen PST
-             * Default-Werte aus der Config für Typ Helmsted verwenden.
+            /** Regelung */
+            /** Spezialregelung - trafo_spezial
+             * 0 - keine Spezialitäten
+             *     Winkel == 0 Grad => Längsregler => RatioTapChanger
+             *     Querregler Winkel != 0 => Querregler => PhaseTapChanger =>  PhaseTapChangerLinear | PhaseTapChangerTabular
+             * 1 - Typ Meeden
+             *     Symmetrischer Querregler => PhaseTapChangerSymmetrical
+             * 2 - Typ Helmstedt
+             *     Asymmetrischer Querregler => PhaseTapChangerAsymmetrical
              * */
-            const tapChangerControl = new TapChangerControl_1.TapChangerControl(common_utils_1.CommonUtils.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl((0, parser_utils_1.getUUID)(i7Data.guid_rc_v), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
             tapChangerControl.discrete = true;
-            const regulatingControlEnabled = regelung === 0 ? false : true;
+            const regulatingControlEnabled = regelung === 1 ? true : false;
             tapChangerControl.enabled = regulatingControlEnabled;
             ratioTapChanger.controlEnabled = regulatingControlEnabled;
             tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
             tapChangerControl.targetValue = spannungsband.usoll;
-            tapChangerControl.targetDeadband = spannungsband.umax - spannungsband.usoll;
+            tapChangerControl.targetDeadband = spannungsband.umax ? spannungsband.umax - spannungsband.usoll : (spannungsband.umin ? spannungsband.usoll - spannungsband.umin : spannungsband.usoll - (spannungsband.usoll * 0.95));
             tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.k;
             // Assoziationen
             ratioTapChanger.tapChangerControl = tapChangerControl;
@@ -5261,39 +5688,19 @@ class ConverterIntegral7 {
         cimModel.addRatioTapChanger(ratioTapChanger);
         return ratioTapChanger;
     }
-    createPhaseTapChanger(i7Data, transformerEnds, cimModel, tapChangerNumber, transformerinfo) {
+    createPhaseTapChanger(i7Data, transformerEnds, cimModel, gestufteSeite, tapChangerNumber, transformerinfo) {
         var _a;
         const transformerEndInfo = (_a = transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.transformerEndInfos) === null || _a === void 0 ? void 0 : _a.find(elem => elem.endNumber === tapChangerNumber);
         const tapChangerInfo = transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.tapChangerInfo;
-        let gestufteSeite = (0, parser_utils_1.isNumericI7)(i7Data[`gestufte_seite_s${tapChangerNumber}`])
-            ? i7Data[`gestufte_seite_s${tapChangerNumber}`]
-            : transformerEndInfo === null || transformerEndInfo === void 0 ? void 0 : transformerEndInfo.gestufteSeite;
-        // Normieren
-        gestufteSeite = gestufteSeite === 0 ? 1 : gestufteSeite;
-        /**
-         * 0 - obere Spannungsseite (Anschluss 1)
-         * 1 - obere Spannungsseite (Anschluss 1)
-         * 2 - mittlere Spannungsseite (Anschluss 1)
-         * 3 - Niederspannungsseite (Anschluss 2)
-         * ? - Externer Knoten  (Anschluss 3)
-         * */
         const transformerEnd = transformerEnds.find(elem => elem.endNumber === gestufteSeite);
-        const is3WTransformer = transformerEnds.length > 2 ? true : false;
-        // ist ein Stufenschalter vorhanden?
-        /**
-         * 1 obere Spannungsseite
-         * 2 mittlere Spannungsseite
-         * 3 Niederspannungsseite
-         * */
         /** Regelung */
         /** Spezialregelung - trafo_spezial
          * 0 - keine Spezialitäten
-         *     Winkel == 0 Grad => Längsregler => RatioTapChanger
-         *     Querregler Winkel != 0 => Querregler => PhaseTapChanger =>  PhaseTapChangerLinear | PhaseTapChangerTabular
+         *     Winkel != 0 => Querregler => PhaseTapChanger =>  PhaseTapChangerLinear | PhaseTapChangerTabular
          * 1 - Typ Meeden
-         *     Symetrischer Querregler => PhaseTapChangerSymmetrical
+         *     Symmetrischer Querregler => PhaseTapChangerSymmetrical
          * 2 - Typ Helmstedt
-         *     Asymetrischer Querregler => PhaseTapChangerAsymmetrical
+         *     Asymmetrischer Querregler => PhaseTapChangerAsymmetrical
          * */
         let phaseTapChanger;
         /**
@@ -5302,48 +5709,45 @@ class ConverterIntegral7 {
          * Defaul-Werte aus der Config für Typ Helmsted verwenden.
          * */
         let spezialregelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? i7Data.trafo_spezial : transformerinfo === null || transformerinfo === void 0 ? void 0 : transformerinfo.spezialRegelung;
-        spezialregelung = spezialregelung ? spezialregelung : (is3WTransformer ? 2 : undefined);
+        spezialregelung = (0, parser_utils_1.isNumericI7)(spezialregelung) ? (0, parser_utils_1.convertToNumberI7)(spezialregelung) : undefined;
         const winkel = (0, parser_utils_1.isNumericI7)(i7Data[`uzus_winkel_s${tapChangerNumber}`])
             ? i7Data[`uzus_winkel_s${tapChangerNumber}`]
             : tapChangerInfo === null || tapChangerInfo === void 0 ? void 0 : tapChangerInfo.stepPhaseIncrement;
         switch (spezialregelung) {
             case (1): {
                 // 1 - Typ Meeden
-                const phaseTapChangerSync = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical(common_utils_1.CommonUtils.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                // TODO uzus_winkel_s s. CIM CGMES Doku
-                // phaseTapChangerSync.windingConnectionAngle = convertToNumberI7(i7Data[`uzus_winkel_s${transformerEnd.endNumber}`]);
-                phaseTapChanger = phaseTapChangerSync;
-                cimModel.addPhaseTapChangerSymmetrical(phaseTapChangerSync);
+                const phaseTapChangerSym = new PhaseTapChangerSymmetrical_1.PhaseTapChangerSymmetrical((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                phaseTapChanger = phaseTapChangerSym;
+                cimModel.addPhaseTapChangerSymmetrical(phaseTapChangerSym);
                 break;
             }
             case (2): {
                 // 2 - Typ Helmstedt
-                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(common_utils_1.CommonUtils.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                phaseTapChangerAsync.windingConnectionAngle = winkel;
-                phaseTapChanger = phaseTapChangerAsync;
-                cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
+                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;
             }
             default: {
-                // 2 - Typ Helmstedt
-                const phaseTapChangerAsync = new PhaseTapChangerAsymmetrical_1.PhaseTapChangerAsymmetrical(common_utils_1.CommonUtils.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-                phaseTapChangerAsync.windingConnectionAngle = winkel;
-                phaseTapChanger = phaseTapChangerAsync;
-                cimModel.addPhaseTapChangerAsymmetrical(phaseTapChangerAsync);
+                // 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}`)), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+                phaseTapChanger = phaseTapChangerLin;
+                cimModel.addPhaseTapChangerLinear(phaseTapChangerLin);
                 break;
             }
         }
         // Attribute
-        phaseTapChanger.ltcFlag = false;
-        transformerEnd.phaseTapChanger = phaseTapChanger;
+        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.transformerEnd = transformerEnd;
+        //transformerEnd.phaseTapChanger = phaseTapChanger;
         // Wirkleistungsregelung Anschluss
-        const pRegulationFromNode = i7Data.von_a_nr;
-        const pRegulationToNode = i7Data.nach_a_nr;
+        const pRegulationToNode = (0, parser_utils_1.isNumericI7)(i7Data.nach_a_nr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.nach_a_nr) : undefined;
         const regulatingTransformerEnd = transformerEnds.find(elem => elem.endNumber === pRegulationToNode);
         // Regelung
-        let pVorgabe = (0, parser_utils_1.isNumericI7)(i7Data[`p_vorgabe`]) ? +i7Data[`p_vorgabe`] : undefined; // PST Trafo
-        if (is3WTransformer && tapChangerNumber > 1) {
-            pVorgabe = (0, parser_utils_1.isNumericI7)(i7Data[`p_vorgabe_2`]) ? +i7Data[`p_vorgabe_2`] : undefined; // PST Trafo
+        let pVorgabe = (0, parser_utils_1.isNumericI7)(i7Data[`p_vorgabe`]) ? (0, parser_utils_1.convertToNumberI7)(+i7Data[`p_vorgabe`]) : undefined; // PST Trafo
+        if (pVorgabe === undefined) {
+            pVorgabe = (0, parser_utils_1.isNumericI7)(i7Data[`p_vorgabe_2`]) ? (0, parser_utils_1.convertToNumberI7)(+i7Data[`p_vorgabe_2`]) : undefined; // PST Trafo
         }
         // Wirkflussvorgabe
         if (isFinite(pVorgabe) && regulatingTransformerEnd) {
@@ -5358,18 +5762,16 @@ class ConverterIntegral7 {
              * 3 -> Stromkompoundierung -> stromabhängige Spannungsregelung
              * 4 -> Blindleitungsbilazierung
              * */
-            const tapChangerControl = new TapChangerControl_1.TapChangerControl(common_utils_1.CommonUtils.generateUUID(), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
+            const tapChangerControl = new TapChangerControl_1.TapChangerControl((0, parser_utils_1.getUUID)(i7Data.guid_rc_p), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
             tapChangerControl.discrete = true;
-            const regulatingControlEnabled = regelung === 0 ? false : true;
+            const regulatingControlEnabled = regelung === 2 ? true : false;
             tapChangerControl.enabled = regulatingControlEnabled;
             phaseTapChanger.controlEnabled = regulatingControlEnabled;
             tapChangerControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.activePower;
             tapChangerControl.targetValue = pVorgabe;
-            // TODO targetDeadband
-            tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M;
+            tapChangerControl.targetValueUnitMultiplier = UnitMultiplier_1.UnitMultiplier.M; //ist das wirklich Bestandteil des CGMES?
             // Assoziationen
             phaseTapChanger.tapChangerControl = tapChangerControl;
-            phaseTapChanger.transformerEnd = transformerEnd;
             this.setTapChangerControl(phaseTapChanger, regulatingTerminal);
             tapChangerControl.addTapChanger(phaseTapChanger);
             cimModel.addTapChangerControl(tapChangerControl);
@@ -5451,6 +5853,25 @@ class ConverterIntegral7 {
             }
         }
     }
+    /** Equipment grounding
+     * @param shnt ShuntCompensator object
+     * @param stpKnoten Map mit den Sterpunktknoten aus der I7 Datenbank
+     * */
+    setShuntGrounding(shnt, stpKnoten, r0, x0) {
+        if (stpKnoten) {
+            shnt.grounded = (0, parser_utils_1.isBooleanI7)(stpKnoten.geerdet) ? (0, parser_utils_1.convertToBooleanI7)(stpKnoten.geerdet) : false;
+        }
+        else {
+            //equipment is not grounded
+            shnt.grounded = false;
+        }
+        if (r0 === undefined && x0 === undefined) {
+            shnt.grounded = false;
+        }
+        else {
+            shnt.grounded = true;
+        }
+    }
     /** AnschlussIDs von Leitungen für Topologie abfragen */
     queryLeitungsAnschlussIDs() {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -5693,4 +6114,17 @@ 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(acdcConverter) {
+    // TODO
+    return new DCGround_1.DCGround();
+}
+exports.createDCGround = createDCGround;
+function createNeutralGroundReturn(dcConverterUnit1, dcConverterUnit12) {
+    // TODO
+}
+exports.createNeutralGroundReturn = createNeutralGroundReturn;
+function connectDCGround(acdcConverter) {
+    // TODO
+}
+exports.connectDCGround = connectDCGround;
 //# sourceMappingURL=converter.integral7.js.map