Changeset 1182 for sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures

Timestamp:

Jul 17, 2019 4:50:44 PM (4 years ago)

Author:

krzywon

Message:

Tie NXcanSAS into reduction methods and add debugging statements.

Location:

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_Protocol_Reduction.ipf (modified) (4 diffs)
• V_Write_VSANS_NXcanSAS.ipf (modified) (10 diffs)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/V_Protocol_Reduction.ipf

@@ -3275 +3275 @@
         String fullpath = "", newfileName=""
         String saveType = StringByKey("SAVE",avgStr,"=",";")            //does user want to save data?
+        NVAR useNXcanSASOutput = root:Packages:NIST:gNXcanSAS_Write
 
         If( (cmpstr(saveType[0,2],"Yes")==0) && (cmpstr(av_type,"none") != 0) )         
@@ -3341 +3342 @@
 //                              endif
 //
+                                
                                 if(cmpstr(saveType,"Yes - Concatenate")==0)
                                         V_Trim1DDataStr(activeType,binType,trimBegStr,trimEndStr)                       // x- passing null strings uses global or default trim values
@@ -3348 +3350 @@
                                         V_RemoveDuplicateQvals("root:Packages:NIST:VSANS:",activeType)          // works with the "tmp_x" waves from concatenateForSave
 //                                      prot[9] = collimationStr
-                                        
-                                        V_Write1DData("root:Packages:NIST:VSANS:",activeType,newFileName+"."+exten)             //don't pass the full path, just the name
+                                        if (useNXcanSASOutput == 1)
+                                                WriteNxCanSAS1D(activeType,fullPath,dialog)
+                                        else
+                                                V_Write1DData("root:Packages:NIST:VSANS:",activeType,newFileName+"."+exten)             //don't pass the full path, just the name
+                                        EndIf
                                 
                                 endif
@@ -3371 +3376 @@
                                 V_QxQy_Export(activeType,fullPath,newFileName,dialog)
                                 break
+                        case "2D_NXcanSAS":
+                                fullPath = S_Path + newFileName+".h5"
+                                V_WriteNXcanSAS2DData(activeType,fullPath,newFileName,dialog)
+                                break
                         case "PNG_Graphic":
 //                              SaveAsPNG(activeType,fullpath,dialog)

sans/Dev/branches/nxcansas_writer/NCNR_User_Procedures/Reduction/VSANS/V_Write_VSANS_NXcanSAS.ipf

@@ -14 +14 @@
         
         SetDataFolder $(pathStr+folderStr)
+        
+        Print "Starting the process of writing to NXcanSAS files"
         
         // Check fullpath and dialog
@@ -72 +74 @@
         Make/O/T/N=1 $(parentBase + ":run") = {V_getExperiment_identifier(folderStr)}
         CreateStrNxCansas(fileID,nxcansasBase,"","run",$(parentBase + ":run"),empty,empty)
+        
+        Print "Writing VSANS 1D Data in NXcanSAS format"
         
         // SASData
@@ -97 +101 @@
         CreateVarNxCansas(fileID,dataParent,"sasdata","Qmean",qbar,units,inv_angstrom)
         
+        Print "Writing VSANS Meta Data in NXcanSAS format"
+        
         // Write all VSANS meta data
         V_WriteMetaData(fileID,parentBase,nxcansasBase,folderStr,proto)
@@ -217 +223 @@
                 pixY = V_getDet_pixel_num_y(type,detStr)
                 
-                fileName = newFileName
+                fileName = saveName
                 fileDate = V_getDataStartTime(type)             // already a string
                 fileLabel = V_getSampleDescription(type)
@@ -299 +305 @@
 
                 Variable ret1,ret2,ret3,nq
-                String collimationStr
-                
-                
-                collimationStr = proto[9]
+                String collimationStr = proto[9]
                 
                 nq = pixX*pixY
@@ -321 +324 @@
 v_tic()
                 Make/O/N=(2,pixX,pixY) qxy_vals
-                //everything in 1D now
                 Make/O/N=(pixX,pixY) shadow
                 Make/O/N=(2,pixX,pixY) SigmaQ_combined
@@ -327 +329 @@
                         jj = 0
                         do
-                                nq = ii * pixelsX + jj
-                                get2DResolution(qval[nq],phi[nq],lambda,lambdaWidth,DDet,apOff,S1,S2,L1,L2,BS,pixSize,usingLenses,r_dist[nq],ret1,ret2,ret3)
+                                nq = ii * pixX + jj
+                                V_get2DResolution(qval[nq],phi[nq],r_dist[nq],folderStr,detStr,collimationStr,ret1,ret2,ret3)
                                 qxy_vals[0][ii][jj] = qx_val[nq]
                                 qxy_vals[1][ii][jj] = qy_val[nq]
-                                SigmaQ_combined[0][ii][jj] = ret1       
+                                SigmaQ_combined[0][ii][jj] = ret1
                                 SigmaQ_combined[1][ii][jj] = ret2
-                                shadow[ii][jj] = ret3   
+                                shadow[ii][jj] = ret3
                                 jj+=1
-                        while(jj<pixelsX)
+                        while(jj<pixX)
                         ii+=1
-                while(ii<pixelsY)
-v_toc() 
+                while(ii<pixY)
+v_toc()
+
         ////*********************       
                 Duplicate/O qx_val,qx_val_s
@@ -355 +358 @@
                 Redimension/N=(pixX*pixY) qx_val_s,qy_val_s,qz_val_s,z_val_s,sw_s
                 
+                String dataParent,dataBase
                 // SASData
-                String dataParent = nxcansasBase + "sasdata" + kk + "/"
+                sPrintf dataParent,"%ssasdata%d/",nxcansasBase,kk
                 // Create SASdata entry
-                String dataBase = parentBase + ":sasdata" + kk
+                sPrintf dataBase,"%s:sasdata%d",parentBase,kk
                 NewDataFolder/O/S $(dataBase)
                 Make/O/T/N=5 $(dataBase + ":attr") = {"canSAS_class","signal","I_axes","NX_class","Q_indices", "timestamp"}
-                Make/O/T/N=5 $(dataBase + ":attrVals") = {"SASdata","I","Q,Q","NXdata","0,1",textw[1]}
+                Make/O/T/N=5 $(dataBase + ":attrVals") = {"SASdata","I","Q,Q","NXdata","0,1",V_getDataEndTime(folderStr)}
                 CreateStrNxCansas(fileID,dataParent,"","",empty,$(dataBase + ":attr"),$(dataBase + ":attrVals"))
                 // Create i entry
@@ -386 +390 @@
                 
                 KillWaves/Z qx_val_s,qy_val_s,z_val_s,qz_val_s,SigmaQx_s,SigmaQy_s,fSubS_s,sw,sw_s
-                
                 Killwaves/Z qval,sigmaQx,SigmaQy,fSubS,phi,r_dist
-                
-                
         
         endfor
@@ -395 +396 @@
         KillWaves/Z labelWave,dum
         
-        
-        
-        // Write all meta data
-        WriteMetaData(fileID,parentBase,nxcansasBase,rw,textw)
+        // Write all VSANS meta data
+        V_WriteMetaData(fileID,parentBase,nxcansasBase,folderStr,proto)
+                
+        //
+        ///////////////////////////////////////////////////////////////////////////
         
         // Close the file