Changeset 931


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/User Procedures/Nika/NI1_ConvProc.ipf

    r903 r931  
    34913491                                        //extract the order number and use that to sort out..
    34923492                                        Make/O/N=(numpnts(ListOf2DSampleData)) tempSortWv
    3493                                         tempSortWv = IN2G_FindNumericalIndexForSorting(ListOf2DSampleData[p])
     3493                                        tempSortWv = IN2G_FindNumIndxForSort(ListOf2DSampleData[p])
    34943494                                        //tempSortWv = NI1A_FindeOrderNumber(ListOf2DSampleData[p])
    34953495                                        sort tempSortWv, tempSortWv, ListOf2DSampleData, ListOf2DSampleDataNumbers
     
    35003500                                        Make/O/N=(numpnts(ListOf2DSampleData)) tempSortWv
    35013501                                        //tempSortWv = NI1A_FindeOrderNumber(ListOf2DSampleData[p])
    3502                                         tempSortWv = IN2G_FindNumericalIndexForSorting(ListOf2DSampleData[p])
     3502                                        tempSortWv = IN2G_FindNumIndxForSort(ListOf2DSampleData[p])
    35033503                                        sort/R tempSortWv, tempSortWv, ListOf2DSampleData, ListOf2DSampleDataNumbers
    35043504                                        KillWaves/Z tempSortWv
  • trunk/User Procedures/Nika/NI1_SquareMatrix.ipf

    r913 r931  
    3434        endif
    3535        if(withTilts)
    36                 NI1_MakeSqMatrixOfLineoutswtilts(SectorsNumSect,SectorsSectWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)   
     36                NI1_MakeSqMtxOfLinswtilts(SectorsNumSect,SectorsSectWidth,SectorsGraphStartAngle,SectorsGraphEndAngle) 
    3737        else
    3838                NI1_MakeSqMatrixOfLineouts(SectorsNumSect,SectorsSectWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)         //convert to lineout
     
    210210
    211211//josh add with tilts
    212 Function NI1_MakeSqMatrixOfLineoutswtilts(SectorsNumSect,AngleWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)
     212Function NI1_MakeSqMtxOfLinswtilts(SectorsNumSect,AngleWidth,SectorsGraphStartAngle,SectorsGraphEndAngle)
    213213//strategy:  this function will return a squaremap just like the original, but with row points that each correspond to
    214214//a specific q-bin. To do this, the q2dwave is used (and must have been already created) to make squaremap with q-points.
Note: See TracChangeset for help on using the changeset viewer.