@@ -380,8 +380,12 @@ def SetStratigraphicLog(
380380
381381 return response
382382
383-
384- def GetStratigraphicLog (root , indexList = [], indexRange = (0 , 0 ), verbose = False ):
383+ def GetStratigraphicLog (
384+ root ,
385+ indexList = [],
386+ indexRange = (0 , 0 ),
387+ verbose = False
388+ ):
385389 response = {"errorFlag" : False }
386390 resp = GetStratigraphicInformationGroup (root )
387391 if resp ["errorFlag" ]:
@@ -392,6 +396,9 @@ def GetStratigraphicLog(root, indexList=[], indexRange=(0, 0), verbose=False):
392396 maxValidIndex = min (
393397 siGroup .dimensions ["index" ].size , siGroup .getncattr ("index_MaxValid" )
394398 )
399+ thickness_calculator_data = []
400+ thickness_calculator_active_flags = []
401+
395402 # Select all option
396403 if (
397404 indexList == []
@@ -402,13 +409,17 @@ def GetStratigraphicLog(root, indexList=[], indexRange=(0, 0), verbose=False):
402409 # Select all
403410 for i in range (0 , maxValidIndex ):
404411 data .append ((siGroup .variables .get ("stratigraphicLayers" )[i ]))
405- response ["value" ] = data
412+ thickness_calculator_data .append (siGroup .variables .get ("thicknessCalculator" )[:])
413+ thickness_calculator_active_flags .append (siGroup .variables .get ("thicknessCalculatorActiveFlags" )[:])
414+
406415 # Select based on list of indices option
407416 elif indexList != []:
408417 for i in indexList :
409418 if int (i ) >= 0 and int (i ) < maxValidIndex :
410419 data .append ((siGroup .variables .get ("stratigraphicLayers" )[i ]))
411- response ["value" ] = data
420+ thickness_calculator_data .append (siGroup .variables .get ("thicknessCalculator" )[:])
421+ thickness_calculator_active_flags .append (siGroup .variables .get ("thicknessCalculatorActiveFlags" )[:])
422+
412423 # Select based on indices range option
413424 elif (
414425 len (indexRange ) == 2
@@ -418,15 +429,25 @@ def GetStratigraphicLog(root, indexList=[], indexRange=(0, 0), verbose=False):
418429 for i in range (indexRange [0 ], indexRange [1 ]):
419430 if int (i ) >= 0 and int (i ) < maxValidIndex :
420431 data .append ((siGroup .variables .get ("stratigraphicLayers" )[i ]))
421- response ["value" ] = data
432+ thickness_calculator_data .append (siGroup .variables .get ("thicknessCalculator" )[:])
433+ thickness_calculator_active_flags .append (siGroup .variables .get ("thicknessCalculatorActiveFlags" )[:])
434+
422435 else :
423436 errStr = "Non-implemented filter option"
424437 if verbose :
425438 print (errStr )
426439 response = {"errorFlag" : True , "errorString" : errStr }
440+ return response
441+
442+ response ["value" ] = {
443+ "stratigraphicLayers" : data ,
444+ "thicknessCalculatorData" : thickness_calculator_data ,
445+ "thicknessCalculatorActiveFlags" : thickness_calculator_active_flags ,
446+ }
427447 return response
428448
429449
450+
430451# Set drillhole log
431452def SetDrillholeLog (root , data , append = False , verbose = False ):
432453 """
0 commit comments