Changeset 931

Timestamp:

Apr 20, 2020 5:26:20 PM (2 years ago)

Author:

ilavsky

Message:

Nika Igor 7 fixes, there is bug which I am not sure how to fix.

Location:

trunk/User Procedures/Nika

Files:

• NI1_ConvProc.ipf (modified) (2 diffs)
• NI1_SquareMatrix.ipf (modified) (2 diffs)

trunk/User Procedures/Nika/NI1_ConvProc.ipf

@@ -3491 +3491 @@
                                         //extract the order number and use that to sort out..
                                         Make/O/N=(numpnts(ListOf2DSampleData)) tempSortWv
-                                        tempSortWv = IN2G_FindNumericalIndexForSorting(ListOf2DSampleData[p])
+                                        tempSortWv = IN2G_FindNumIndxForSort(ListOf2DSampleData[p])
                                         //tempSortWv = NI1A_FindeOrderNumber(ListOf2DSampleData[p]) 
                                         sort tempSortWv, tempSortWv, ListOf2DSampleData, ListOf2DSampleDataNumbers
@@ -3500 +3500 @@
                                         Make/O/N=(numpnts(ListOf2DSampleData)) tempSortWv
                                         //tempSortWv = NI1A_FindeOrderNumber(ListOf2DSampleData[p]) 
-                                        tempSortWv = IN2G_FindNumericalIndexForSorting(ListOf2DSampleData[p])
+                                        tempSortWv = IN2G_FindNumIndxForSort(ListOf2DSampleData[p])
                                         sort/R tempSortWv, tempSortWv, ListOf2DSampleData, ListOf2DSampleDataNumbers
                                         KillWaves/Z tempSortWv

trunk/User Procedures/Nika/NI1_SquareMatrix.ipf

@@ -34 +34 @@
         endif
         if(withTilts)
-                NI1_MakeSqMatrixOfLineoutswtilts(SectorsNumSect,SectorsSectWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)   
+                NI1_MakeSqMtxOfLinswtilts(SectorsNumSect,SectorsSectWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)  
         else
                 NI1_MakeSqMatrixOfLineouts(SectorsNumSect,SectorsSectWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)         //convert to lineout
@@ -210 +210 @@
 
 //josh add with tilts
-Function NI1_MakeSqMatrixOfLineoutswtilts(SectorsNumSect,AngleWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)
+Function NI1_MakeSqMtxOfLinswtilts(SectorsNumSect,AngleWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)
 //strategy:  this function will return a squaremap just like the original, but with row points that each correspond to
 //a specific q-bin. To do this, the q2dwave is used (and must have been already created) to make squaremap with q-points.