- new focusmerge.dat for new merge type

This commit is contained in:
cvs
2001-04-27 08:37:42 +00:00
parent 8c2285026b
commit 63d84a85ad
11 changed files with 442 additions and 317 deletions

View File

@@ -657,6 +657,15 @@
return;
}
if( (self->iUpper || self->iLower) && self->iMiddle)
{
NXDupdate(pDict,"bank","merged");
NXDaliaslink(pFile,pDict,"dana","dcounts");
NXDaliaslink(pFile,pDict,"dana","dtime");
NXDaliaslink(pFile,pDict,"dana","dtheta");
NXDaliaslink(pFile,pDict,"dana","cnmon1");
}
if(self->iUpper)
{
NXDupdate(pDict,"bank","upperbank");
@@ -681,14 +690,6 @@
NXDaliaslink(pFile,pDict,"dana","dtheta");
NXDaliaslink(pFile,pDict,"dana","cnmon1");
}
if( (self->iUpper || self->iLower) && self->iMiddle)
{
NXDupdate(pDict,"bank","merged");
NXDaliaslink(pFile,pDict,"dana","dcounts");
NXDaliaslink(pFile,pDict,"dana","dtime");
NXDaliaslink(pFile,pDict,"dana","dtheta");
NXDaliaslink(pFile,pDict,"dana","cnmon1");
}
/* close everything */