comparison common.cpp @ 256:4dcb09f5fe85

Commit patch deprecating the --size argument, replacing it with --ntracks, --datadims and --datasize. These names are not ideal, but will serve for now.
author mas01cr
date Wed, 16 Apr 2008 09:59:43 +0000
parents 2cc06e5b05a5
children dee55886eca0
comparison
equal deleted inserted replaced
254:fe922b9d87f8 256:4dcb09f5fe85
113 dataBufLength = dbH->timesTableOffset - dbH->dataOffset; 113 dataBufLength = dbH->timesTableOffset - dbH->dataOffset;
114 timesTableLength = dbH->powerTableOffset - dbH->timesTableOffset; 114 timesTableLength = dbH->powerTableOffset - dbH->timesTableOffset;
115 powerTableLength = dbH->l2normTableOffset - dbH->powerTableOffset; 115 powerTableLength = dbH->l2normTableOffset - dbH->powerTableOffset;
116 l2normTableLength = dbH->dbSize - dbH->l2normTableOffset; 116 l2normTableLength = dbH->dbSize - dbH->l2normTableOffset;
117 } else { 117 } else {
118 fileTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLESIZE); 118 fileTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_FILETABLE_ENTRY_SIZE);
119 trackTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_TRACKTABLESIZE); 119 trackTableLength = ALIGN_PAGE_UP(dbH->numFiles * O2_TRACKTABLE_ENTRY_SIZE);
120 dataBufLength = ALIGN_PAGE_UP(dbH->length); 120 dataBufLength = ALIGN_PAGE_UP(dbH->length);
121 timesTableLength = ALIGN_PAGE_UP(2*(dbH->length / dbH->dim)); 121 timesTableLength = ALIGN_PAGE_UP(2*(dbH->length / dbH->dim));
122 powerTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim); 122 powerTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim);
123 l2normTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim); 123 l2normTableLength = ALIGN_PAGE_UP(dbH->length / dbH->dim);
124 } 124 }