Changeset 1148


Ignore:
Timestamp:
Oct 6, 2021 12:22:45 PM (12 months ago)
Author:
ilavsky
Message:

Prepare for releases. Modify release numbers etc.

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/Igor Procedures/Boot Indra2.ipf

    r1114 r1148  
    11#pragma rtGlobals=1             // Use modern global access method.
    2 #pragma version = 1.985
    3 #pragma IgorVersion=8.03
     2#pragma version = 1.99
     3#pragma IgorVersion=8.04
    44
    5 //1.985  beta
     5//1.99   October2021 release
     6//                              Sample Survey tool
     7//                              Step scanning in BlueSky and other associated changes.
     8//                              Removed lots of old code for USAXS, its not working anyway.     
    69//1.98   September2020 release.
    710//1.97   February 2020 release.
  • trunk/Igor Procedures/Boot Nika.ipf

    r1113 r1148  
    11#pragma rtGlobals=1             // Use modern global access method.
    2 #pragma version = 1.835
    3 #pragma IgorVersion=8.03
     2#pragma version = 1.84
     3#pragma IgorVersion=8.04
    44
    5 //1.835 current beta release.
     5//1.84          October2021 release, IP9 maintenance and other changes.
    66//1.83  September2020 release
    77//1.82          February 2020 release. Maintenance, many small changes.
  • trunk/User Procedures/Indra 2/IN2_USAXS.ipf

    r1143 r1148  
    11#pragma TextEncoding = "UTF-8"
    22#pragma rtGlobals=3                     // Use modern global access method.
    3 #pragma IgorVersion=8.03   //requires Igor version 8.03 or higher
    4 #pragma version = 1.985
    5 
    6 constant CurrentIndraVersionNumber = 1.985
     3#pragma IgorVersion=8.04   //requires Igor version 8.03 or higher
     4#pragma version = 1.99
     5
     6constant CurrentIndraVersionNumber = 1.99
    77//*************************************************************************\
    88//* Copyright (c) 2005 - 2021, Argonne National Laboratory
     
    1111//*************************************************************************/
    1212
    13 //1.985   beta
    14 //                      Removed lots of old code for USAXS, its not working anyway.     
     13//1.999   beta
     14//                              Sample Survey tool
     15//                              Step scanning in BlueSky and other associated changes.
     16//                              Removed lots of old code for USAXS, its not working anyway.     
    1517//1.98          require Igor 8.03, no testing for Igor 7 anymore.
    1618//                      step scanning from BS still not fully supported, needs more developement.
     
    533535        SetDrawLayer UserBack
    534536        SetDrawEnv fsize= 18,fstyle= 1,textrgb= (16384,28160,65280)
    535         DrawText 10,37,"Indra 2 macros for Igor Pro 8.03+"
     537        DrawText 10,37,"Indra 2 macros for Igor Pro 8.04 & 9.x"
    536538        SetDrawEnv fsize= 16,textrgb= (16384,28160,65280)
    537539        DrawText 52,64,"@ Jan Ilavsky, 2021"
  • trunk/User Procedures/Indra 2/IN3_SamplePlate.ipf

    r1147 r1148  
    156156                PopupMenu NewPlateTemplate,pos={300,50},size={330,21},proc=IN3S_PopMenuProc,title="Template :", help={"Pick Plate template"}
    157157                PopupMenu NewPlateTemplate,mode=1,popvalue=SelectedPlateName, fColor=(1,16019,65535)
    158                 PopupMenu NewPlateTemplate,value="9x9 Acrylic/magnetic plate;NMR Acrylic plate;Old Style Al Plate;NMR Tubes holder;NMR tubes heater;Generic Grid holder;Image;AgBehenateLaB6;"
     158                PopupMenu NewPlateTemplate,value="9x9 Acrylic/magnetic plate;NMR Acrylic plate;Old Style Al Plate;NMR Tubes holder;NMR tubes heater;Generic Grid holder;AgBehenateLaB6;"
    159159                Button PopulateTable,pos={300,75},size={120,17}, proc=IN3S_ButtonProc,title="Populate Table", help={"Creates new set of positions"}
    160160                Button CreateImage,pos={440,75},size={120,17}, proc=IN3S_ButtonProc,title="Create image", help={"Creates new set of positions"}
     
    29802980       
    29812981        switch(s.eventCode)
    2982                 case 7:                         // Mouse up...
     2982                case 7:                         // cursor moved is 7...
    29832983                        //print s.cursorName
    29842984                        //print s.pointNumber
    29852985                        //print s.yPointNumber
    29862986                        strswitch(s.cursorName)
     2987                                hookResult =1
    29872988                                case "A":
    29882989                                        xRT = s.pointNumber
     
    30023003                                        break
    30033004                        endswitch       
    3004                        
    3005                         hookResult =1
    30063005                        break
    30073006        endswitch
     
    32973296                Button SetSYAs00 fColor=(65535,32768,32768)
    32983297
    3299                 Button STOPMotors,pos={10,445},size={105,30}, proc=IN3S_SurveyButtonProc,title="STOP motors",fSize=14, help={"STOP ALL MOTORS MOVEMENT"}
     3298                Button SyncMotors,pos={10,425},size={105,15}, proc=IN3S_SurveyButtonProc,title="Sync w/epics",fSize=14, help={"Sync all motors positons with epics"}
     3299                Button STOPMotors,pos={10,450},size={105,30}, proc=IN3S_SurveyButtonProc,title="STOP motors",fSize=14, help={"STOP ALL MOTORS MOVEMENT"}
    33003300                Button STOPMotors fColor=(65535,32768,32768)
    33013301
     
    33043304                Button OpenSlitsSWAXS,pos={250,475},size={135,20}, proc=IN3S_SurveyButtonProc,title="SWAXS Slits",fSize=14, help={"Open Slits for SAXS/WAXS"}
    33053305
    3306                 TitleBox Info5 title="\Zr110NOTE: row numbering is 0 based...",size={355,20},pos={5,480},frame=0,fColor=(0,0,65535),labelBack=0
     3306                TitleBox Info5 title="\Zr110NOTE: row numbering is 0 based...",size={355,20},pos={5,485},frame=0,fColor=(0,0,65535),labelBack=0
    33073307
    33083308        endif
     
    33993399                        NVAR SampleXTAR = root:Packages:SamplePlateSetup:SampleXTAR
    34003400                        NVAR SampleYTAR = root:Packages:SamplePlateSetup:SampleYTAR
     3401                        NVAR SampleXRBV = root:Packages:SamplePlateSetup:SampleXRBV
     3402                        NVAR SampleYRBV = root:Packages:SamplePlateSetup:SampleYRBV
    34013403                        Wave LBSelectionWv = root:Packages:SamplePlateSetup:LBSelectionWv
    34023404                        if(StringMatch(ba.ctrlName, "MoveSXLow"))               
     
    34393441                                IN3S_MoveMotorInEpics("SX",SampleXTAR)
    34403442                                IN3S_MoveMotorInEpics("SY",SampleYTAR)
     3443                        endif
     3444                        if(StringMatch(ba.ctrlName, "SyncMotors"))
     3445#if(exists("pvOpen")==4)
     3446                                variable SxPV, SyPV
     3447                                pvOpen/Q SxPV, "9idcLAX:m58:c2:m1.RBV"
     3448                                pvOpen/Q SyPV, "9idcLAX:m58:c2:m2.RBV"
     3449                                SampleXTAR = IN3S_GetMotorPositions(SxPV)
     3450                                SampleYTAR = IN3S_GetMotorPositions(SyPV)
     3451                                SampleXRBV = IN3S_GetMotorPositions(SxPV)
     3452                                SampleYRBV = IN3S_GetMotorPositions(SyPV)
     3453                                pvWait 5
     3454                                pvClose SxPV
     3455                                pvClose SyPV
     3456#endif
    34413457                        endif
    34423458                        variable InstrumentUsed
  • trunk/User Procedures/Indra 2/Readme.txt

    r1058 r1148  
    77************************************
    88This set of macros is developed for data reduction of USAXS data obtained on APS USAXS instrument beamline instrument.
    9 It runs on Wavemetrics Igor Pro version 8.03 and higher.
     9It runs on Wavemetrics Igor Pro version 8.04 and higher.
    1010
    1111
    1212Modification history:
    1313_____________________________________________________________________________________
    14 1.981
     141.99 10/10/2021
    1515Fixed all fixed length wave names (hopefully). Now should use long names if user chooses so in Configuration for all waves and folders.
    16 Sample Survey tool -  multiple row selection enabled, Clipboard now handles multiple rows. Manual updated.
     16Sample Survey tool -  multiple row selection enabled, Clipboard now handles multiple rows. Manual updated. Added ability to import image from jpg/tiff/gif... files
     17Minor changes to various setting to make user life easier.
     18Step scanning in BlueSky (uses Nexus file) now fully supported and well tested.
    1719
    1820
  • trunk/User Procedures/Irena/IR1_Main.ipf

    r1128 r1148  
    22#pragma rtGlobals = 3   // Use strict wave reference mode and runtime bounds checking
    33#pragma version=2.705
    4 #pragma IgorVersion=8.03
     4#pragma IgorVersion=8.04
    55
    66//DO NOT renumber Main files every time, these are main release numbers...
    77//define manual date and release verison
    8 constant CurrentIrenaVersionNumber = 2.705              //change version of Boot Irena1 modeling.ipf to get proper check version.
     8constant CurrentIrenaVersionNumber = 2.71               //change version of Boot Irena1 modeling.ipf to get proper check version.
    99
    1010//*************************************************************************
     
    1414//*************************************************************************
    1515
    16 //2.705 Beta version after September 2020 release.
     16//2.71          October 2021 release.
    1717//                      New MultisamplePlotting tool
    1818//                      Add replacement for Analytical models: System Specific models
     
    872872        SetDrawLayer UserBack
    873873        SetDrawEnv fsize= 20,fstyle= 1,textrgb= (16384,28160,65280)
    874         DrawText 23,30,"Irena macros for Igor Pro 8.03+"
     874        DrawText 23,30,"Irena macros for Igor Pro 8.04 & 9.x"
    875875        SetDrawEnv fsize= 16,textrgb= (16384,28160,65280)
    876876        DrawText 100,60,"@ ANL, 2021"
  • trunk/User Procedures/Irena/Modification history.txt

    r1087 r1148  
    55************************************
    66This set of macros is developed for analysis data of USAXS, SAXS, and WAXS data from various instruments.
    7 It runs on Wavemetrics Igor Pro version 8.03 and higher.
     7It runs on Wavemetrics Igor Pro version 8.04 and higher.
    88
    99
    1010Modification history:
    1111********************************************
    12 2.701 - TBA
     122.71 10/10/2021
     13Igor 9 compatible.
    1314Fix All tools using the new Multi-GUI (MultiPlot, Simple Fits, bioSAXS...) to handle data with liberal names, apparently that was forgotten. 
    1415New tools:
     
    1617Analyze Results - new tool with new GUI for analysis of results Irena produces. For now, Size distributions. Replaced Analyze Size Distribution tool. Can be extended as needed.
    1718Data Manipulation III - WIP, not finished yet. Multi sample selection tool and ability to modify data. Can delete data (finished).
     19Simple Fits & Analysis tool - added 1D correlation model.
    1820All - changed wrong spelling Ploting into correct Plotting. This may leave some windows opened on restart.
    1921Fixed all fixed length wave names (hopefully). Now should use long names if user chooses so in Configuration for all waves and folders.
     
    2123Merge data tool - Added Optimization method: "Optimize Overlap, trim Data1" when data122 are trimmed at the very start of overlap, removing noise at overlap.
    2224Unified fit - fixed fitting problem when "Link B to G/Rg/P?" was selected, code was not refreshing calculated B during fitting. Caused misfits. 
     25Unified fit - set automatically k as P varies, this reduces clutter on GUI and behaves more reasonable.
    2326Multi data plotting tool - added Contour plot and Waterfall plot.
    2427Export data tool - add option to export SAXS/WAXS data against Q, d, or Two theta.
     28Form factor - add disk form factor with thickness as dimension.
     29Structure factor - added Distorted crystal SF.
     30ASCII export - fix export of USAXS data to ASCII which failed to export correct Q values. 
    2531
    2632
     
    3440Added Multi Data Plot tool, new tool to plot quickly many data sets. New ipf file...
    3541Added Metadata Browser tool, enables relatively easy extraction of values from metadata in wave notes.
    36 Added Basic fits + Simple Analysis tool, new tool and new capabilities. Guinier, Porod, Sphere and Spheroid, more to come as needed
     42Added Simple Fits & Analysis tool, new tool and new capabilities. Guinier, Porod, Sphere and Spheroid, more to come as needed
    3743Added group of bioSAS tools - specialized simple import, data averaging and buffer subtraction, etc. Linked to menu also some existing tools for other functions bioSAS needs.
    3844tools: Import ASCII, Average/Subtract/Scale tool, and PDDF + Molecular weight calculator. Uses ATSAS to get PDDF.
  • trunk/User Procedures/Nika/Modification history.txt

    r1038 r1148  
    55************************************
    66This set of macros is developed for data reduction of SAXS and WAXS area detector data.
    7 It runs on Wavemetrics Igor Pro version 8.03 and higher.
     7It runs on Wavemetrics Igor Pro version 8.04 and higher.
    88
    99
     
    1111Modification history:
    1212********************************************
    13 1.831 beta
     131.84 10/10/2021
     14Igor 9 compatible.
    1415Fixed all fixed length wave names (hopefully). Now should use long names if user chooses so in Configuration for all waves and folders.
     16Fixed edf importer which developed bugs over time due to changes in detector software.
     17Add new Eiger detector dimensions to Pilatus detector options.
    1518
    16191.83  9/3/2020
  • trunk/User Procedures/Nika/NI1_Main.ipf

    r1113 r1148  
    11#pragma TextEncoding = "UTF-8"
    22#pragma rtGlobals=3             // Use modern global access method.
    3 #pragma version=1.835
    4 #pragma IgorVersion=8.03
     3#pragma version=1.84
     4#pragma IgorVersion=8.04
    55
    66//DO NOT renumber Main files every time, these are main release numbers...
    77
    8 constant CurrentNikaVersionNumber = 1.835
     8constant CurrentNikaVersionNumber = 1.84
    99constant FixBackgroundOversubScale=1.05                 //this is used to fix oversubtracted background. Adds FixBackgroundOversubScale*abs(V_min) to all intensity value.
    1010constant NikaNumberOfQCirclesDisp=15
     
    1515//*************************************************************************/
    1616
    17 //1.835         current beta version
    18 //                      minor changes.
     17//1.84  Ocotber2021 version
     18//                      Fixes for some loaders where users found failures.
    1919//1.83          require Igor 8.03 now. Not testing Igor 7 anymore.
    2020//                      Improve NXcanSAS 2D calibrated data import for NSLS-SMI beamline.
     
    364364        DrawText 11,230,"     "
    365365        DrawText 11,250," "
    366         DrawText 11,265,"Igor 7.05 & 8.0x compatible"
     366        DrawText 11,265,"Igor 8.04 & 9.x compatible"
    367367end
    368368
Note: See TracChangeset for help on using the changeset viewer.