← Back to branch summary

~ubuntu-branches/ubuntu/precise/gpp4/precise

« back to all changes in this revision

Viewing changes to src/cmap_header.c

  • Committer: Bazaar Package Importer
  • Author(s): Morten Kjeldgaard
  • Date: 2011-01-11 13:47:36 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20110111134736-2blfcoz9uoknpic7
Tags: 1.3.0-0ubuntu1
* New upstream release 1.3.0
* debian/control: Add ${misc:Depends}, bump standards-version
* Patched to address various compiler warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cmap_header.c
32
32
  \return 1 on success, EOF on failure*/
33
33
int parse_mapheader(CMMFile *mfile)
34
34
{
35
 
  const int read_total = 74;
 
35
  const int read_total = 77;
36
36
  const size_t header_size = 1024U, n_byt_symop = 80U;
37
37
  unsigned char buffer[224];
38
38
  int result;
46
46
   result += ccp4_file_readint(mfile->stream, &buffer[64], 3);
47
47
   result += ccp4_file_readfloat(mfile->stream, &buffer[76], 3);
48
48
   result += ccp4_file_readint(mfile->stream, &buffer[88], 3);
 
49
   /* skew matrix and translation */
49
50
   result += ccp4_file_readfloat(mfile->stream, &buffer[100], 12);
 
51
   /* reserved */
50
52
   result += ccp4_file_readint(mfile->stream, &buffer[148], 8);
51
 
   result += ccp4_file_readchar(mfile->stream, &buffer[180], 24);
52
 
   result += ccp4_file_readint(mfile->stream, &buffer[204], 3);
 
53
   /* user access */
 
54
   result += ccp4_file_readchar(mfile->stream, &buffer[180], 28);
 
55
   /* map and machine stamp */
 
56
   result += ccp4_file_readint(mfile->stream, &buffer[208], 2);
 
57
   /* ARMS */
53
58
   result += ccp4_file_readfloat(mfile->stream, &buffer[216], 1);
54
59
   result += ccp4_file_readint(mfile->stream, &buffer[220], 1);
55
60
   
72
77
  memcpy(&mfile->spacegroup,&buffer[88],sizeof(int));
73
78
  memcpy(&mfile->symop.size,&buffer[92],sizeof(int));
74
79
  memcpy(&mfile->user_access,&buffer[180],sizeof(mfile->user_access));
75
 
  memcpy(&mfile->data.header_size,&buffer[204],sizeof(int));
 
80
  /* memcpy(&mfile->data.header_size,&buffer[204],sizeof(int)); */
76
81
  memcpy(&frms,&buffer[216],sizeof(float));
77
82
  mfile->stats.rms = (double) frms;
78
83
  memcpy(&mfile->labels.number,&buffer[220],sizeof(int));
80
85
  memcpy(&result,&buffer[96],sizeof(int));
81
86
  if (result !=0) {
82
87
    memcpy(&mfile->skew.rotation[0][0],&buffer[100],sizeof(mfile->skew.rotation));
83
 
    memcpy(&mfile->skew.translation[0],&buffer[148],sizeof(mfile->skew.translation));
 
88
    memcpy(&mfile->skew.translation[0],&buffer[136],sizeof(mfile->skew.translation));
84
89
  }
85
90
  
86
91
  ccp4_file_setmode(mfile->stream, mfile->data_mode);
102
107
  \return 1 on success, EOF on failure */
103
108
int write_mapheader(CMMFile *mfile)
104
109
{
105
 
  const int write_total = 74;
 
110
  const int write_total = 77;
106
111
  unsigned char buffer[224];
107
112
  int result;
108
113
  float fmean,frms;
121
126
  memcpy(&buffer[88],&mfile->spacegroup,sizeof(int));
122
127
  memcpy(&buffer[92],&mfile->symop.size,sizeof(int));
123
128
  memcpy(&buffer[180],&mfile->user_access,sizeof(mfile->user_access));
124
 
  memcpy(&buffer[204],&mfile->data.header_size,sizeof(int));
 
129
  /* memcpy(&buffer[204],&mfile->data.header_size,sizeof(int)); */
125
130
  memcpy(&buffer[208],"MAP ",4U);
126
131
  frms = (float) mfile->stats.rms;
127
132
  memcpy(&buffer[216],&frms,sizeof(float));
143
148
   result += ccp4_file_writeint(mfile->stream, &buffer[88], 3);
144
149
   result += ccp4_file_writefloat(mfile->stream, &buffer[100], 12);
145
150
   result += ccp4_file_writeint(mfile->stream, &buffer[148], 8);
146
 
   result += ccp4_file_writechar(mfile->stream, &buffer[180], 24);
147
 
   result += ccp4_file_writeint(mfile->stream, &buffer[204], 3);
 
151
   result += ccp4_file_writechar(mfile->stream, &buffer[180], 28);
 
152
   result += ccp4_file_writeint(mfile->stream, &buffer[208], 2);
148
153
   result += ccp4_file_writefloat(mfile->stream, &buffer[216], 1);
149
154
   result += ccp4_file_writeint(mfile->stream, &buffer[220], 1);
150
155