Skip to content

Commit

Permalink
More specific CDF var-name reassignment
Browse files Browse the repository at this point in the history
  • Loading branch information
@cpiker
cpiker committed Oct 8, 2024
1 parent 60706bb commit 87547a0
Show file tree
Hide file tree
Showing 3 changed files with 156 additions and 46 deletions.
6 changes: 4 additions & 2 deletions das2/var_ary.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1292,11 +1292,13 @@ DasErrCode DasVarAry_encode(DasVar* pBase, const char* sRole, DasBuf* pBuf)
nItems *= gvec.ncomp; /* More items per packet if we have vectors */

/* Make sure we have a summary of this vector system */
if(DasDesc_getLocal((DasDesc*)pBase, "summary") == NULL){
/*
if(DasDesc_getLocal((DasDesc*)pBase, "notes") == NULL){
const char* sTmp = das_compsys_desc(gvec.systype);
if(sTmp != NULL)
DasDesc_setStr((DasDesc*)pBase, "summary", sTmp);
DasDesc_setStr((DasDesc*)pBase, "notes", sTmp);
}
*/
}
else{
DasBuf_puts(pBuf, ">\n");
Expand Down
173 changes: 135 additions & 38 deletions utilities/das3_cdf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,13 @@ void prnHelp()
" Provide a mapping from automatic variable names to CDF variables\n"
" The map file has one name pair per line and has pattern:\n"
"\n"
" OUTPUT_NAME = [INPUT_PKTID] INPUT_DIM [INPUT_ROLE]\n"
" OUTPUT_NAME = INPUT_PKTID INPUT_DIM INPUT_ROLE [cdfName]\n"
"\n"
" Only the input dimension name is required, the variable role and\n"
" packet ID are only needed for streams with repeated dimension names.\n"
" Remapping variable names is helpful when using template CDFs.\n"
" A pound symbol, '#', denotes a comment that runs to the end of\n"
" the line.\n"
" The value \"*\" can be used to match any input packet ID. The \n"
" cdfName is optional and can be used further restrict the match.\n"
" Note [cdfName] represents the input cdfName (if any), the output\n"
" cdfName is on the left hand side. A pound symbol, '#', denotes a\n"
" comment that runs to the end of the line.\n"
"\n"
" -f,--filter-vars\n"
" Only output \"data\" variables mentioned in the variable map file.\n"
Expand Down Expand Up @@ -417,7 +417,8 @@ typedef struct var_name_map {
int nPktId;
char sDimName[DAS_MAX_ID_BUFSZ];
char sVarRole[DASDIM_ROLE_SZ];
char sCdfName[MAX_VAR_NAME_LEN];
char sOldCdfName[MAX_VAR_NAME_LEN];
char sOutName[MAX_VAR_NAME_LEN];
} var_name_map_t;

/* Load a variable name mapping, last entry is null for sentienal
Expand All @@ -430,6 +431,8 @@ typedef struct var_name_map {
*/
var_name_map_t* loadVarMap(const char* sFile)
{
daslog_info_v("Reading variable name map from %s", sFile);

FILE* pIn = fopen(sFile, "r");
if(pIn == NULL){
das_error(PERR, "Couldn't open variable name map file '%s'.", sFile);
Expand Down Expand Up @@ -493,20 +496,32 @@ var_name_map_t* loadVarMap(const char* sFile)
pSep = strchr(pCdfName, '=');
*pSep = '\0';
pCdfName = das_strip(pCdfName, '\0');
strncpy(pMap[iMap].sCdfName, pCdfName, MAX_VAR_NAME_LEN-1);
strncpy(pMap[iMap].sOutName, pCdfName, MAX_VAR_NAME_LEN-1);

/* This can have up to three sub fields */
/* This can have up to four sub fields */
pDasPath = das_strip(pSep + 1, '\0');

/* See if the value starts with a digit. If so assume it's a packet ID */
if(isdigit(pDasPath[0])){
if(pDasPath[0] == '*'){
pMap[iMap].nPktId = 0; /* Match any packet ID */
pSep = strchr(pDasPath + 1, ' ');
}
else{
if(!isdigit(pDasPath[0]) ){
das_error(PERR,
"%s, line %d: Packet ID is not `*` or an integer", sFile, iLine
);
goto VAR_MAP_ERROR;
}

if((pSep = strchr(pDasPath, ' ')) == NULL){
das_error(PERR,
"%s, line %d: Packet ID not followed by a dimension name", sFile, iLine
);
goto VAR_MAP_ERROR;
}
*pSep = '\0';

if( (sscanf(pDasPath, "%hu", &uDasId) != 1) ||(uDasId == 0)){
das_error(PERR,
"%s, line %d: Could not convert '%s' to a packet ID (aka 16-bit integer > 0).",
Expand All @@ -515,23 +530,42 @@ var_name_map_t* loadVarMap(const char* sFile)
goto VAR_MAP_ERROR;
}
pMap[iMap].nPktId = uDasId;
pDasPath = das_strip(pSep + 1, '\0');
}

pDasPath = das_strip(pSep + 1, '\0');

/* Split off role if appended at the end, or just use 'center' */
if((pSep = strchr(pDasPath, ' ')) != NULL){
*pSep = '\0';
pDasPath = das_strip(pDasPath, '\0');
strncpy(pMap[iMap].sDimName, pDasPath, DAS_MAX_ID_BUFSZ-1);
if((pSep = strchr(pDasPath, ' ')) == NULL){
das_error(PERR,
"%s, line %d: Missing variable role name.", sFile, iLine
);
}

pDasPath = das_strip(pSep + 1, '\0');
*pSep = '\0';
pDasPath = das_strip(pDasPath, '\0');
strncpy(pMap[iMap].sDimName, pDasPath, DAS_MAX_ID_BUFSZ-1);

pDasPath = das_strip(pSep + 1, '\0');

/* There may be one or two strings left */
if((pSep = strchr(pDasPath, ' ')) == NULL){
/* No cdf var, just a role */
pDasPath = das_strip(pDasPath, '\0');
strncpy(pMap[iMap].sVarRole, pDasPath, DASDIM_ROLE_SZ-1);
}
else{
strncpy(pMap[iMap].sDimName, pDasPath, DAS_MAX_ID_BUFSZ-1);
strncpy(pMap[iMap].sVarRole, DASVAR_CENTER, DASDIM_ROLE_SZ-1);
*pSep = '\0';
strncpy(pMap[iMap].sVarRole, pDasPath, DASDIM_ROLE_SZ-1);
pDasPath = das_strip(pSep + 1, '\0');
strncpy(pMap[iMap].sOldCdfName, pDasPath, MAX_VAR_NAME_LEN-1);
}

daslog_debug_v("Var Name Map: (%d %s %s [%s]) => %s",
pMap[iMap].nPktId,
pMap[iMap].sDimName,
pMap[iMap].sVarRole,
pMap[iMap].sOldCdfName
);
++iMap;
}

Expand All @@ -545,6 +579,82 @@ var_name_map_t* loadVarMap(const char* sFile)
return NULL;
}

const char* _VarNameMap_newName(
const var_name_map_t* pMap, int nPktId, const DasVar* pVar
){
if(pMap == NULL) return NULL;

const DasDim* pDim = (DasDim*) (((DasDesc*)pVar)->parent);
if(pDim == NULL)
return NULL;

assert( ((DasDesc*)pDim)->type == PHYSDIM);

const char* sRole = NULL;
for(size_t u = 0; u < pDim->uVars; ++u){
if(pDim->aVars[u] == pVar){
sRole = pDim->aRoles[u];
break;
}
}
if(sRole == NULL){
das_error(PERR, "Couldn't find var 0x%zx in dimension %s", pVar, DasDim_id(pDim));
return NULL;
}

/* First try for a structure match */
const var_name_map_t* pIter = pMap;

while((pIter != NULL)&&(pIter->sOutName[0] != '\0')){
if((strcmp(pIter->sDimName, DasDim_id(pDim)) == 0)&&
(strcmp(pIter->sVarRole, sRole) == 0)&&
((pIter->nPktId == 0)||(nPktId < 1)||(pIter->nPktId == nPktId))
){

if(pIter->sOldCdfName[0] != '\0'){
const char* sPropVal = DasDesc_getStr((const DasDesc*)pVar, "cdfName");
if( (sPropVal != NULL )&&( strcmp(pIter->sOldCdfName, sPropVal) == 0) ) {
daslog_info_v("Mapping variable %s %s:%s [%s] -to-> %s",
(pIter->nPktId == 0) ? "for all packets with" : "for matching packet IDs",
pIter->sDimName, pIter->sVarRole, pIter->sOldCdfName, pIter->sOutName
);
return pIter->sOutName;
}
}
else{

if(pIter->nPktId > 0)
daslog_info_v("For dataset ID %02d, mapping \"%s:%s\" -to-> \"%s\"",
nPktId, pIter->sDimName, pIter->sVarRole, pIter->sOutName
);
else
daslog_info_v("For all datasets, mapping dimension %s:%s -to-> %s",
pIter->sDimName, pIter->sVarRole, pIter->sOutName
);
return pIter->sOutName;
}
}
++pIter;
}

/* That was a flop. See if the variable (or it's dimension) have
a cdfName property, if so use that for the matching source */
const char* sPropVal = DasDesc_getStr((const DasDesc*)pVar, "cdfName");
if(sPropVal == NULL)
return NULL;

pIter = pMap;
while((pIter != NULL)&&(pIter->sOutName[0] != '\0')){
if(strcmp(pIter->sDimName, sPropVal) == 0){
daslog_info_v("Mapping variable name %s to %s", sPropVal, pIter->sDimName);
return pIter->sOutName;
}
++pIter;
}
daslog_debug_v("No remapping for var: %s:%s", DasDim_id(pDim), sRole);
return NULL;
}

/* ************************************************************************* */

struct context {
Expand Down Expand Up @@ -1486,26 +1596,13 @@ const char* DasVar_cdfName(
return NULL;
}

/* Since variables are just riding off the dimension for now, use it's name in
the lookup */
while((pMap != NULL)&&(pMap->sCdfName[0] != '\0')){
if((strcmp(pMap->sDimName, DasDim_id(pDim)) == 0)&&
(strcmp(pMap->sVarRole, sRole) == 0)&&
((nPktId < 1)||(pMap->nPktId == nPktId))
){
if(nPktId > 0)
daslog_info_v("For dataset ID %02d, mapping \"%s:%s\" -to-> \"%s\"",
nPktId, pMap->sDimName, pMap->sVarRole, pMap->sCdfName
);
else
daslog_info_v("For all datasets, mapping dimension %s:%s -to-> %s",
pMap->sDimName, pMap->sVarRole, pMap->sCdfName
);
memset(sBuf, 0, uBufLen);
strncpy(sBuf, pMap->sCdfName, uBufLen - 1);
return sBuf;
}
++pMap;
/* First try to get a match based off of the packet ID, dimension name and
variable use */
const char* sMatch = _VarNameMap_newName(pMap, nPktId, pVar);
if(sMatch != NULL){
memset(sBuf, 0, uBufLen);
strncpy(sBuf, sMatch, uBufLen - 1);
return sBuf;
}

/* If this dim has a CDF_NAME property, then use it for the role */
Expand Down
23 changes: 17 additions & 6 deletions utilities/das3_spice.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -902,16 +902,17 @@ DasErrCode _addRotation(XCalc* pCalc, const char* sAnonFrame, DasDs* pDsOut)
++nAryRank;
if(nItems < 0) nItems = -1; /* if any dim ragged, just make codec ragged */

char sId[64] = {'\0'};
const DasDim* pDimIn = (const DasDim*)DasDesc_parent((const DasDesc*)(pCalc->pVarIn));
const char* sDimIn = DasDim_dim(pDimIn);
const char* sIdIn = DasDim_id(pDimIn);

/* If the input array is a double, move up to doubles for the output */
const DasAry* pAryIn = DasVar_getArray(pCalc->pVarIn);
das_val_type vtElOut = ((pAryIn != NULL)&&(DasAry_valType(pAryIn) == vtDouble)) ?
vtDouble : vtFloat;

snprintf(sId, 63, "%s_%s", sDimIn, pReq->aOutFrame);
char sId[64] = {'\0'};
snprintf(sId, 63, "%s_%s", sIdIn, pReq->aOutFrame);
DasAry* pAryOut = new_DasAry(
sId, vtDouble, 0, NULL, nAryRank, aAryShape, DasVar_units(pCalc->pVarIn)
);
Expand Down Expand Up @@ -962,6 +963,11 @@ DasErrCode _addRotation(XCalc* pCalc, const char* sAnonFrame, DasDs* pDsOut)
snprintf(sBuf, 127, "%s values rotated into %s", DasDim_id(pDimIn), pReq->aOutFrame);
DasDesc_setStr((DasDesc*)pDimOut, "summary", sBuf);

/* toss a bone to the cdf writer if it happens to be downstream */
/*if(DasDesc_has((DasDesc*)pDimOut, "cdfName"))
DasDesc_remove((DasDesc*)pDimOut, "cdfName");
*/

return DasDs_addDim(pDsOut, pDimOut);
}

Expand Down Expand Up @@ -1391,8 +1397,7 @@ DasErrCode _writeRotation(DasDs* pDsIn, XCalc* pCalc, double rTimeShift)
assert(pVecIn);

memset(aRecIn, 0, 3*sizeof(SpiceDouble)); /* zero any missing components */
for(ubyte u = 0; u < pVecIn->ncomp; ++u)
das_geovec_values(pVecIn, aRecIn);
das_geovec_values(pVecIn, aRecIn);

if(pVecIn->systype != DAS_VSYS_CART){ /* convert non-cart input coords */
switch(pVecIn->systype){
Expand Down Expand Up @@ -1435,8 +1440,14 @@ DasErrCode _writeRotation(DasDs* pDsIn, XCalc* pCalc, double rTimeShift)
aRecOut[0] = aTmp[0]; aRecOut[1] = aTmp[1]; aRecOut[2] = aTmp[2];
}

aOutput[0] = aRecOut[0]; aOutput[1] = aRecOut[1]; aOutput[2] = aRecOut[2];
DasAry_append(pAryOut, (ubyte*) aOutput, 3);
if(DasAry_valType(pAryOut) == vtFloat){
aOutput[0] = aRecOut[0]; aOutput[1] = aRecOut[1]; aOutput[2] = aRecOut[2];
DasAry_append(pAryOut, (ubyte*) aOutput, 3);
}
else{
assert(DasAry_valType(pAryOut) == vtDouble);
DasAry_append(pAryOut, (ubyte*) aRecOut, 3);
}
/* DasAry_markEnd() See TODO note above on rolling ragged arrays */
}
CHECK_SPICE;
Expand Down

0 comments on commit 87547a0

Please sign in to comment.