Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GE AcquisitionDuration (#808) #810

Merged
merged 2 commits into from
Mar 29, 2024
Merged

GE AcquisitionDuration (#808) #810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b256504
GE AcquisitionDuration (#808)
Mar 28, 2024
608f636
GE AcquisitionDuration minor (#808)
Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions console/nii_dicom.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4477,6 +4477,7 @@ const uint32_t kEffectiveTE = 0x0018 + uint32_t(0x9082 << 16); //FD
#define kLastScanLoc 0x0019 + (0x101B << 16)
#define kBandwidthPerPixelPhaseEncode 0x0019 + (0x1028 << 16) //FD
#define kSliceTimeSiemens 0x0019 + (0x1029 << 16) ///FD
#define kAcquisitionDurationGE 0x0019 + (0x105a << 16) //FL Acquisition Duration in microsecond, Duration of Scan (series)
#define kPulseSequenceNameGE 0x0019 + (0x109C << 16) //LO 'epiRT' or 'epi'
#define kInternalPulseSequenceNameGE 0x0019 + (0x109E << 16) //LO 'EPI' or 'EPI2'
#define kRawDataRunNumberGE 0x0019 + (0x10A2 << 16)//SL
Expand Down Expand Up @@ -5825,6 +5826,8 @@ const uint32_t kEffectiveTE = 0x0018 + uint32_t(0x9082 << 16); //FD
d.accelFactPE = accelFactPE;
break;
case kAcquisitionDuration:
if (!isSameFloatGE(d.acquisitionDuration, 0.0))
break; //issue 808: give precedence to more precise measures, e.g kAcquisitionDurationGE (0019,105a)
//n.b. used differently by different vendors https://github.com/rordenlab/dcm2niix/issues/225
d.acquisitionDuration = dcmFloatDouble(lLength, &buffer[lPos], d.isLittleEndian);
break;
Expand All @@ -5838,6 +5841,12 @@ const uint32_t kEffectiveTE = 0x0018 + uint32_t(0x9082 << 16); //FD
printf("%s\t FrameAcquisitionDateTime %0.4f \n", dateTime, dTime);
//d.triggerDelayTime = dTime;
}*/
case kAcquisitionDurationGE: // issue 808
if (d.manufacturer != kMANUFACTURER_GE)
break;
d.acquisitionDuration = dcmFloat(lLength, &buffer[lPos], d.isLittleEndian);
d.acquisitionDuration /= 1000000.0; //convert microsec to sec
break;
case kDiffusionDirectionality: { // 0018, 9075
set_directionality0018_9075(&volDiffusion, (&buffer[lPos]));
if ((d.manufacturer != kMANUFACTURER_PHILIPS) || (lLength < 10))
Expand Down
2 changes: 1 addition & 1 deletion console/nii_dicom.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extern "C" {
#define kCPUsuf " " //unknown CPU
#endif

#define kDCMdate "v1.0.20240325"
#define kDCMdate "v1.0.20240327"
#define kDCMvers kDCMdate " " kJP2suf kLSsuf kCCsuf kCPUsuf

static const int kMaxEPI3D = 1024; //maximum number of EPI images in Siemens Mosaic
Expand Down
Loading