Comments

git-svn-id: svn://cook.msm.cam.ac.uk:745/diff-tomo/dtr@280 bf6ca9ba-c028-0410-8290-897cf20841d1

1 files changed, 50 insertions, 50 deletions

diff --git a/src/mrc.h b/src/mrc.h
index 6a66142..b3f5844 100644
--- a/src/mrc.h
+++ b/src/mrc.h
@@ -23,57 +23,57 @@
 
 typedef struct struct_mrcheader {
 	
-	int32_t		nx;
-	int32_t		ny;
-	int32_t		nz;
-	int32_t		mode;
-	int32_t		nxstart;
-	int32_t		nystart;
-	int32_t		nzstart;
-	int32_t		mx;
-	int32_t		my;
-	int32_t		mz;
-	float		xlen;
-	float		ylen;
-	float		zlen;
-	float		alpha;
-	float		beta;
-	float		gamma;
-	int32_t		mapc;
-	int32_t		mapr;
-	int32_t		maps;
-	float		amin;
-	float		amax;
-	float		amean;
-	uint16_t	ispg;		/* Space group number */
-	uint16_t	nsymbt;
-	int32_t		next;
-	uint16_t	dvid;
-	char		extra[30];
-	uint16_t	numintegers;
-	uint16_t	numfloats;
-	uint16_t	sub;
-	uint16_t	zfac;
-	float		min2;
-	float		max2;
-	float		min3;	
-	float		max3;	
-	float		min4;	
-	float		max4;
-	uint16_t	idtype;
-	uint16_t	lens;
-	uint16_t	nd1;
-	uint16_t	nd2;
-	uint16_t	vd1;
-	uint16_t	vd2;
-	float		tiltangles[9];
-	float		zorg;
-	float		xorg;
-	float		yorg;
-	int32_t		nlabl;
-	char		data[10][80];
+	int32_t		nx;		/*   0 */
+	int32_t		ny;		/*   4 */
+	int32_t		nz;		/*   8 */
+	int32_t		mode;		/*  12 */
+	int32_t		nxstart;	/*  16 */
+	int32_t		nystart;	/*  20 */
+	int32_t		nzstart;	/*  24 */
+	int32_t		mx;		/*  28 */
+	int32_t		my;		/*  32 */
+	int32_t		mz;		/*  36 */
+	float		xlen;		/*  40 */
+	float		ylen;		/*  44 */
+	float		zlen;		/*  48 */
+	float		alpha;		/*  52 */
+	float		beta;		/*  56 */
+	float		gamma;		/*  60 */
+	int32_t		mapc;		/*  64 */
+	int32_t		mapr;		/*  68 */
+	int32_t		maps;		/*  72 */
+	float		amin;		/*  76 */
+	float		amax;		/*  80 */
+	float		amean;		/*  84 */
+	uint16_t	ispg;		/*  88 (4 byte word aligned) Space group number */
+	uint16_t	nsymbt;		/*  90 (2 byte word aligned) */
+	int32_t		next;		/*  92 (back to 4 byte word aligned) */
+	uint16_t	dvid;		/*  96 (4 byte word aligned) */
+	char		extra[30];	/*  98 (2 byte aligned, this padding puts it back on 4 byte alignment) */
+	uint16_t	numintegers;	/* 128 (4) */
+	uint16_t	numfloats;	/* 130 (2) */
+	uint16_t	sub;		/* 132 (4) */
+	uint16_t	zfac;		/* 134 (2) */
+	float		min2;		/* 136 (4 byte word aligned) */
+	float		max2;		/* 140 */
+	float		min3;		/* 144 */
+	float		max3;		/* 148 */
+	float		min4;		/* 152 */
+	float		max4;		/* 156 */
+	uint16_t	idtype;		/* 160 */
+	uint16_t	lens;		/* 162 */
+	uint16_t	nd1;		/* 164 */
+	uint16_t	nd2;		/* 166 */
+	uint16_t	vd1;		/* 168 */
+	uint16_t	vd2;		/* 170 (back to 4 byte alignment - yay!) */
+	float		tiltangles[9];	/* 172 (4 byte alignment) */
+	float		zorg;		/* 208 (=172+9*4) */
+	float		xorg;		/* 212 */
+	float		yorg;		/* 216 */
+	int32_t		nlabl;		/* 220 */
+	char		data[10][80];	/* 224 (4 byte alignment) */
 	
-} MRCHeader;
+} MRCHeader;	/* 1024 bytes total = 224+10*80 */
 
 typedef struct struct_mrcextheader {