From 173bfceec31366b81f6195b89d10c5b68fb088cd Mon Sep 17 00:00:00 2001 From: Takuo Yasunaga Date: Thu, 24 Mar 2022 04:35:20 +0900 Subject: [PATCH] lmrcImageProjectionMIP() mrc2hdf Thumbnail Your branch is up to date with 'origin/master'. Changes to be committed: modified: bin/wish/Display2/tclIndex modified: include/lmrcImageProjection.h modified: src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c modified: src/Objects/DataManip/mrcImage/src/lmrcImageProjection.h modified: src/Tools/filter/mrc2hdf/src/mrc2hdf.c modified: src/Tools/filter/mrc2hdf/src/mrc2hdf.html modified: src/Tools/filter/mrc2hdf/src/test/Makefile Changes not staged for commit: modified: include/eosMATH.h --- bin/wish/Display2/tclIndex | 148 ++++++++++----------- include/lmrcImageProjection.h | 2 + .../DataManip/mrcImage/src/lmrcImageProjection.c | 122 +++++++++++++++++ .../DataManip/mrcImage/src/lmrcImageProjection.h | 2 + src/Tools/filter/mrc2hdf/src/mrc2hdf.c | 130 ++++++++++++------ src/Tools/filter/mrc2hdf/src/mrc2hdf.html | 22 ++- src/Tools/filter/mrc2hdf/src/test/Makefile | 30 +++-- 7 files changed, 331 insertions(+), 125 deletions(-) diff --git a/bin/wish/Display2/tclIndex b/bin/wish/Display2/tclIndex index c4c3f5aa63..03796f98b3 100644 --- a/bin/wish/Display2/tclIndex +++ b/bin/wish/Display2/tclIndex @@ -6,17 +6,43 @@ # element name is the name of a command and the value is # a script that loads the command. -set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]] -set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]] -set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]] -set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]] -set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]] -set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]] -set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]] -set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]] +set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]] +set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]] +set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]] +set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]] +set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]] +set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]] +set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]] +set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]] set auto_index(fileOpen) [list source [file join $dir Display2Image.wish]] set auto_index(mainImagePut) [list source [file join $dir Display2Image.wish]] set auto_index(overviewImagePut) [list source [file join $dir Display2Image.wish]] +set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]] +set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]] +set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]] +set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]] +set auto_index(colormapChange) [list source [file join $dir Display2Colormap.wish]] +set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]] +set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]] +set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]] +set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]] +set auto_index(display2Init) [list source [file join $dir Display2Init.wish]] +set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]] +set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] +set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] +set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] +set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]] set auto_index(histgramGraphCreate) [list source [file join $dir Display2Info.wish]] set auto_index(display2InformationWinCreate) [list source [file join $dir Display2Info.wish]] set auto_index(fileReopen) [list source [file join $dir Display2Info.wish]] @@ -28,41 +54,7 @@ set auto_index(sectionInformationWinCreate) [list source [file join $dir Display set auto_index(ctfInformationWinCreate) [list source [file join $dir Display2Info.wish]] set auto_index(unitCellInformationWinCreate) [list source [file join $dir Display2Info.wish]] set auto_index(scaleInfoWinCreate) [list source [file join $dir Display2Info.wish]] -set auto_index(roiInformationWinCreate) [list source [file join $dir Display2InfoROI.wish]] -set auto_index(roiLineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] -set auto_index(roiSplineInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] -set auto_index(roiRectangleInfoFrameCreate) [list source [file join $dir Display2InfoROI.wish]] -set auto_index(roiAnalysisFrameCreate) [list source [file join $dir Display2InfoROI.wish]] -set auto_index(display2SetVar) [list source [file join $dir Display2Init.wish]] -set auto_index(display2InitVar) [list source [file join $dir Display2Init.wish]] -set auto_index(display2InitVarSet) [list source [file join $dir Display2Init.wish]] -set auto_index(diplay2CanvasInit) [list source [file join $dir Display2Init.wish]] -set auto_index(display2Init) [list source [file join $dir Display2Init.wish]] -set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]] -set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]] -set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]] -set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]] -set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]] -set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]] -set auto_index(menuExitCreate) [list source [file join $dir Display2Menu.wish]] -set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]] -set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]] -set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]] -set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]] -set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]] -set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]] -set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]] -set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]] -set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]] set auto_index(fft2dCmd) [list source [file join $dir fft2dCmd.wish]] -set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]] -set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]] -set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]] -set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]] -set auto_index(projectionRecreate) [list source [file join $dir ProjectionUtil.wish]] -set auto_index(projectionCreate) [list source [file join $dir ProjectionUtil.wish]] -set auto_index(projectionClear) [list source [file join $dir ProjectionUtil.wish]] -set auto_index(projectionChange) [list source [file join $dir ProjectionUtil.wish]] set auto_index(roiAreaCreateStart) [list source [file join $dir RoiAreaCreate.wish]] set auto_index(roiAreaCreateMotion) [list source [file join $dir RoiAreaCreate.wish]] set auto_index(roiAreaCreateEnd) [list source [file join $dir RoiAreaCreate.wish]] @@ -80,15 +72,22 @@ set auto_index(roiSplineEnd) [list source [file join $dir RoiAreaCreate.wish]] set auto_index(splineCreate) [list source [file join $dir RoiAreaCreate.wish]] set auto_index(knobShow) [list source [file join $dir RoiAreaCreate.wish]] set auto_index(knobHide) [list source [file join $dir RoiAreaCreate.wish]] -set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]] -set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]] -set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]] -set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]] -set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]] -set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]] -set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]] -set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]] -set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]] +set auto_index(display2BindingSet) [list source [file join $dir Display2Binding.wish]] +set auto_index(display2MenuSet) [list source [file join $dir Display2Menu.wish]] +set auto_index(menuFileCreate) [list source [file join $dir Display2Menu.wish]] +set auto_index(menuSeqFileCreate) [list source [file join $dir Display2Menu.wish]] +set auto_index(menuWindowCreate) [list source [file join $dir Display2Menu.wish]] +set auto_index(menuInfoCreate) [list source [file join $dir Display2Menu.wish]] +set auto_index(menuHelpCreate) [list source [file join $dir Display2Menu.wish]] +set auto_index(menuExitCreate) [list source [file join $dir Display2Menu.wish]] +set auto_index(roiRelatedObjectRecreate) [list source [file join $dir Display2MenuROI.wish]] +set auto_index(menuRoiCreate) [list source [file join $dir Display2MenuROI.wish]] +set auto_index(menuRoiCancelCommand) [list source [file join $dir Display2MenuROI.wish]] +set auto_index(menuRoiSingleMultiTransform) [list source [file join $dir Display2MenuROI.wish]] +set auto_index(menuMultiRoiOKCommand) [list source [file join $dir Display2MenuROI.wish]] +set auto_index(menuMultiRoiAllDeleteCommand) [list source [file join $dir Display2MenuROI.wish]] +set auto_index(menuMultiRoiDeleteCommand) [list source [file join $dir Display2MenuROI.wish]] +set auto_index(menuEditCreate) [list source [file join $dir Display2MenuROI.wish]] set auto_index(roiAreaResizeStart) [list source [file join $dir RoiAreaResize.wish]] set auto_index(roiAreaResizeMotion) [list source [file join $dir RoiAreaResize.wish]] set auto_index(roiAreaResizeEnd) [list source [file join $dir RoiAreaResize.wish]] @@ -105,29 +104,18 @@ set auto_index(lineRotate) [list source [file join $dir RoiAreaRotate.wish]] set auto_index(lineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] set auto_index(splineRotate) [list source [file join $dir RoiAreaRotate.wish]] set auto_index(splineRotateCalc) [list source [file join $dir RoiAreaRotate.wish]] -set auto_index(roiAreaSelectStart) [list source [file join $dir RoiAreaSelect.wish]] -set auto_index(roiAreaSelectMotion) [list source [file join $dir RoiAreaSelect.wish]] -set auto_index(roiAreaSelectEnd) [list source [file join $dir RoiAreaSelect.wish]] -set auto_index(roiAreaSelectOK) [list source [file join $dir RoiAreaSelect.wish]] -set auto_index(roiAreaFFT) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(splineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(rectangleNearPoint) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(lineNearPoint) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(pointDistance) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(pointDistance2) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(vectorAngle) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(coordGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(coordGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(dataGetInMainImageToReal) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(dataGetInMainImageToCanvas) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(pointSet) [list source [file join $dir RoiAreaUtil.wish]] -set auto_index(roiAreaZoomIn) [list source [file join $dir RoiAreaZoom.wish]] -set auto_index(roiAreaZoomOut) [list source [file join $dir RoiAreaZoom.wish]] -set auto_index(roiAreaZoom) [list source [file join $dir RoiAreaZoom.wish]] -set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]] -set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]] -set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]] -set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]] +set auto_index(roiMultiAreaInfoSave) [list source [file join $dir RoiAreaFile.wish]] +set auto_index(roiMultiAreaInfoLoad) [list source [file join $dir RoiAreaFile.wish]] +set auto_index(roiAreaFileSave) [list source [file join $dir RoiAreaFile.wish]] +set auto_index(layerLineRecreate) [list source [file join $dir LayerLineUtil.wish]] +set auto_index(layerLineCreate) [list source [file join $dir LayerLineUtil.wish]] +set auto_index(layerLineClear) [list source [file join $dir LayerLineUtil.wish]] +set auto_index(layerLineChange) [list source [file join $dir LayerLineUtil.wish]] +set auto_index(fileOpenWinCreate) [list source [file join $dir Display2File.wish]] +set auto_index(fileNewWinCreate) [list source [file join $dir Display2File.wish]] +set auto_index(seqFileOpenWinCreate) [list source [file join $dir Display2File.wish]] +set auto_index(seqFileNewWinCreate) [list source [file join $dir Display2File.wish]] +set auto_index(display2DesktopSet) [list source [file join $dir Display2Desktop.wish]] set auto_index(sectionInit) [list source [file join $dir SectionUtil.wish]] set auto_index(sectionRecreateAll) [list source [file join $dir SectionUtil.wish]] set auto_index(sectionRecreate) [list source [file join $dir SectionUtil.wish]] @@ -136,4 +124,16 @@ set auto_index(sectionCreate) [list source [file join $dir SectionUtil.wish]] set auto_index(sectionClearAll) [list source [file join $dir SectionUtil.wish]] set auto_index(sectionClear) [list source [file join $dir SectionUtil.wish]] set auto_index(sectionChange) [list source [file join $dir SectionUtil.wish]] +set auto_index(ScaleRecreate) [list source [file join $dir ScaleUtil.wish]] +set auto_index(ScaleCreate) [list source [file join $dir ScaleUtil.wish]] +set auto_index(ScaleClear) [list source [file join $dir ScaleUtil.wish]] +set auto_index(ScaleChange) [list source [file join $dir ScaleUtil.wish]] set auto_index(unitCellRecreate) [list source [file join $dir UnitCell.wish]] +set auto_index(display2MenuSet2) [list source [file join $dir Display2Menu2.wish]] +set auto_index(roiAreaMoveStart) [list source [file join $dir RoiAreaMove.wish]] +set auto_index(roiAreaMoveMotion) [list source [file join $dir RoiAreaMove.wish]] +set auto_index(roiAreaMoveEnd) [list source [file join $dir RoiAreaMove.wish]] +set auto_index(rectangleMove) [list source [file join $dir RoiAreaMove.wish]] +set auto_index(lineMove) [list source [file join $dir RoiAreaMove.wish]] +set auto_index(splineMove) [list source [file join $dir RoiAreaMove.wish]] +set auto_index(display2ETCSet) [list source [file join $dir Display2ETCSet.wish]] diff --git a/include/lmrcImageProjection.h b/include/lmrcImageProjection.h index abfc58ea95..ebe3187235 100644 --- a/include/lmrcImageProjection.h +++ b/include/lmrcImageProjection.h @@ -16,5 +16,7 @@ typedef struct lmrcImageProjectionInfo{ /* prototype begin */ extern void lmrcImageProjection(mrcImage* out, mrcImage* in, lmrcImageProjectionInfo* linfo); +extern void lmrcImageProjectionMIP(mrcImage* out, mrcImage* in, + lmrcImageProjectionInfo* linfo); /* prototype end */ #endif diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c b/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c index 271dfaf383..0715d13942 100755 --- a/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c +++ b/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c @@ -129,3 +129,125 @@ lmrcImageProjection( mrcImage* out, mrcImage* in, } +void +lmrcImageProjectionMIP( mrcImage* out, mrcImage* in, + lmrcImageProjectionInfo* linfo) +{ + mrcImageParaTypeReal x, y, z; + double data, dataout; + + switch(linfo->mode) { + case 0: { // along z-axis + out->Header = in->Header; + out->HeaderN.x = in->HeaderN.x; + out->HeaderN.y = in->HeaderN.y; + out->HeaderN.z = 1.0; + mrcInit(out, NULL); + for(z=0; zHeaderN.z; z++) { + for(y=0; yHeaderN.y; y++) { + for(x=0; xHeaderN.x; x++) { + mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest); + mrcPixelDataGet(out, x, y, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest); + if(dataoutHeader = in->Header; + out->HeaderN.x = in->HeaderN.y; + out->HeaderN.y = in->HeaderN.z; + out->HeaderN.z = 1; + mrcInit(out, NULL); + for(z=0; zHeaderN.z; z++) { + for(y=0; yHeaderN.y; y++) { + for(x=0; xHeaderN.x; x++) { + mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest); + mrcPixelDataGet(out, y, z, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest); + if(dataoutHeader = in->Header; + out->HeaderN.x = in->HeaderN.z; + out->HeaderN.y = in->HeaderN.x; + out->HeaderN.z = 1.0; + mrcInit(out, NULL); + for(z=0; zHeaderN.z; z++) { + for(y=0; yHeaderN.y; y++) { + for(x=0; xHeaderN.x; x++) { + mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest); + mrcPixelDataGet(out, z, x, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest); + if(dataoutHeader = in->Header; + out->HeaderN.x = in->HeaderN.y; + out->HeaderN.y = 1.0; + out->HeaderN.z = 1.0; + mrcInit(out, NULL); + for(z=0; zHeaderN.z; z++) { + for(y=0; yHeaderN.y; y++) { + for(x=0; xHeaderN.x; x++) { + mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest); + mrcPixelDataGet(out, y, 0.0, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest); + if(dataoutHeader = in->Header; + out->HeaderN.y = 1.0; + out->HeaderN.z = 1.0; + mrcInit(out, NULL); + for(z=0; zHeaderN.z; z++) { + for(y=0; yHeaderN.y; y++) { + for(x=0; xHeaderN.x; x++) { + mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest); + mrcPixelDataGet(out, x, 0.0, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest); + if(dataoutHeader = in->Header; + out->HeaderN.x = out->HeaderN.z; + out->HeaderN.y = 1.0; + out->HeaderN.z = 1.0; + mrcInit(out, NULL); + for(z=0; zHeaderN.z; z++) { + for(y=0; yHeaderN.y; y++) { + for(x=0; xHeaderN.x; x++) { + mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest); + mrcPixelDataGet(out, z, 0.0, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest); + if(dataoutmode); + } + } +} + + diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.h b/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.h index abfc58ea95..ebe3187235 100755 --- a/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.h +++ b/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.h @@ -16,5 +16,7 @@ typedef struct lmrcImageProjectionInfo{ /* prototype begin */ extern void lmrcImageProjection(mrcImage* out, mrcImage* in, lmrcImageProjectionInfo* linfo); +extern void lmrcImageProjectionMIP(mrcImage* out, mrcImage* in, + lmrcImageProjectionInfo* linfo); /* prototype end */ #endif diff --git a/src/Tools/filter/mrc2hdf/src/mrc2hdf.c b/src/Tools/filter/mrc2hdf/src/mrc2hdf.c index b5c1817384..d02bb68409 100755 --- a/src/Tools/filter/mrc2hdf/src/mrc2hdf.c +++ b/src/Tools/filter/mrc2hdf/src/mrc2hdf.c @@ -233,7 +233,7 @@ lmrc2hdfimaris(hid_t* out, mrcImage* in, lmrc2hdfInfo* linfo, int mode) mrcImageParaTypeReal xorg, yorg, zorg; int irange, numrange; unsigned char* thumbImage; - double sum, min, max; + double sum, min, max, mean; mrcImage tmpImage; lmrcImageProjectionInfo lpro; @@ -263,10 +263,15 @@ lmrc2hdfimaris(hid_t* out, mrcImage* in, lmrc2hdfInfo* linfo, int mode) dims[1] = in[0].HeaderN.y; dims[2] = in[0].HeaderN.x; + /* chunk[0] = dims[0]; chunk[1] = dims[1]; chunk[2] = dims[2]; - + */ + chunk[0] = 32; + chunk[1] = 64; + chunk[2] = 64; + datasetPropertyID = H5Pcreate(H5P_DATASET_CREATE); status = H5Pset_chunk(datasetPropertyID, 3, chunk); @@ -306,6 +311,7 @@ lmrc2hdfimaris(hid_t* out, mrcImage* in, lmrc2hdfInfo* linfo, int mode) for(i=0; i<256; i++) hist[i] = 0; for(i=0; i<1024; i++) hist1024[i] = 0; + // image DEBUGPRINT("image\n"); if(in[itime].HeaderAMax<=in[itime].HeaderAMin) { fprintf(stderr, "Image data is flat\n"); @@ -318,7 +324,7 @@ lmrc2hdfimaris(hid_t* out, mrcImage* in, lmrc2hdfInfo* linfo, int mode) irange=1<=0; i--) { status = H5Gclose(groupID[i]); } diff --git a/src/Tools/filter/mrc2hdf/src/mrc2hdf.html b/src/Tools/filter/mrc2hdf/src/mrc2hdf.html index 2436d28437..99f2a2e20e 100755 --- a/src/Tools/filter/mrc2hdf/src/mrc2hdf.html +++ b/src/Tools/filter/mrc2hdf/src/mrc2hdf.html @@ -1 +1,21 @@ -/bin/bash: mrc2hdf: No such file or directory + + +mrc2hdf + + +

mrc2hdf

+

Usage

+
+Usage: mrc2hdf
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcInfo     ) ] :Optional  :Input
+    [-I[nput]            InList              (NULL      ).as(inFileList::mrcInfo ) ] :Optional  :Input:FileList
+    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-nres[olution]      nResolution         (1         ).as(Integer             ) ] :Optional  :Pyramidal Resolution
+    [-M[ode]             hdf5mode            (1         ).as(Integer             ) ] :Optional  :Mode:0 hdf5 1 imaris
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+
+ + diff --git a/src/Tools/filter/mrc2hdf/src/test/Makefile b/src/Tools/filter/mrc2hdf/src/test/Makefile index e2d26a234f..548ef7f6bb 100644 --- a/src/Tools/filter/mrc2hdf/src/test/Makefile +++ b/src/Tools/filter/mrc2hdf/src/test/Makefile @@ -9,16 +9,28 @@ help: @echo "----- Help Message Check -----" @../$(OSTYPE)/$(OBJECTNAME) -h -exec: - @echo "----- Execution Check -----" -<<<<<<< HEAD - ../$(OSTYPE)/$(OBJECTNAME) -======= - rm -rf data/test.ims data/test2.ims +exec: data/test.ims data/test2.ims data/test-5.ims data/test2-5.ims data/test4.ims + @echo "----- Execution End -----" + + +data/test.ims:data/test.mrc + rm -rf data/test.ims ../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc -o data/test.ims - ../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc -o data/test-4.ims -nres 4 + +data/test-5.ims:data/test.mrc + rm -rf data/test-5.ims + ../$(OSTYPE)/$(OBJECTNAME) -i data/test.mrc -o data/test-5.ims -nres 5 + +data/test2.ims:data/test.mrc + rm -rf data/test2.ims ../$(OSTYPE)/$(OBJECTNAME) -I data/test.lst -o data/test2.ims ->>>>>>> b4bcf0bc43fa5bd4779cc02ccecd9fcba2de9d48 - @echo "----- Calc check -----" + +data/test4.ims:data/test.mrc + rm -rf data/test4.ims + ../$(OSTYPE)/$(OBJECTNAME) -I data/test4.lst -o data/test4.ims + +data/test2-5.ims:data/test.mrc + rm -rf data/test2-5.ims + ../$(OSTYPE)/$(OBJECTNAME) -I data/test.lst -o data/test2-5.ims -nres 4 clean: -- 2.11.0