Changeset 660

Timestamp:

Apr 5, 2010 10:30:25 AM (12 years ago)

Author:

srkline

Message:

Changes to the installer:

Templates are obsolete now. Packages are all loaded from the macros menu. Templates have been deleted from SVN.

Location:

sans/Dev/trunk

Files:

• NCNR_Install_or_Update.pxp (modified) (previous)
• NCNR_SANS_Utilities/SANS_Analysis_v4.1.pxt (deleted)
• NCNR_SANS_Utilities/SANS_LiveData_v1.0.pxt (deleted)
• NCNR_SANS_Utilities/SANS_Reduction_v5.2.pxt (deleted)
• NCNR_SANS_Utilities/TotalTemplate.pxt (deleted)
• NCNR_SANS_Utilities/USANS_Reduction_v2.3.pxt (deleted)
• NCNR_User_Procedures/Common/Installer/FilesToRemove++.itx (modified) (1 diff)
• NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf (modified) (1 diff)
• NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/FilesToRemove++.itx

@@ -91 +91 @@
 WAVES/T IgProcFiles
 BEGIN
-        "NCNR_Package_Loader"
+        "NCNR_Package_Loader.ipf"
 END
 X SetScale/P x 0,1,"", IgProcFiles; SetScale y 0,0,"", IgProcFiles

sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

@@ -406 +406 @@
         
 
-// put shortcuts to the template in the "top" folder
-//
-        NewPath/O/Q UtilPath, homePathStr+"NCNR_SANS_Utilities:"
-        strFileList = IndexedFile(UtilPath,-1,".pxt")   
-        for (i=0; i<itemsInList(strFileList); i+=1)
-                tmpStr = StringFromList(i,strFileList)
-//              isThere = CheckForMatch(tmpStr,IHFolders)
-//              if(isThere)
-//                      Print "Move "+ tmpStr
-//                      MoveFolder/O/P=IHPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr
-                        CreateAliasShortcut/O/P=UtilPath tmpStr as homePathStr +tmpStr
-                        Print "Creating shortcut for "+tmpStr+" into top level: "+IsMoveOK(V_flag)
-//              endif
-        endfor
+
+// now with the NCNR_Package_Loader in the Igor Procedures, the templates are obsolete
+//// put shortcuts to the template in the "top" folder
+////
+//      NewPath/O/Q UtilPath, homePathStr+"NCNR_SANS_Utilities:"
+//      strFileList = IndexedFile(UtilPath,-1,".pxt")   
+//      for (i=0; i<itemsInList(strFileList); i+=1)
+//              tmpStr = StringFromList(i,strFileList)
+////            isThere = CheckForMatch(tmpStr,IHFolders)
+////            if(isThere)
+////                    Print "Move "+ tmpStr
+////                    MoveFolder/O/P=IHPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr
+//                      CreateAliasShortcut/O/P=UtilPath tmpStr as homePathStr +tmpStr
+//                      Print "Creating shortcut for "+tmpStr+" into top level: "+IsMoveOK(V_flag)
+////            endif
+//      endfor
 
 
 // installation is done, quit to start fresh
-        DoAlert 1, "Quit Igor to complete installation.\rQuit now? "
+        DoAlert 1, "Quit and restart Igor to complete installation.\rQuit now? "
         if (V_Flag==1)
                 execute "Quit /Y"

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -411 +411 @@
                                         ErrorBars/T=0 $w1 Y,wave=($w2,$w2)
                                         ModifyGraph tickUnit(left)=1
+                                        Label left "I(q)"
+                                        Label bottom "q (A\\S-1\\M)"
                                         Legend
                                 endif
@@ -420 +422 @@
                                 ErrorBars/T=0 $w1 Y,wave=($w2,$w2)
                                 ModifyGraph tickUnit(left)=1
+                                Label left "I(q)"
+                                Label bottom "q (A\\S-1\\M)"
                                 Legend
                         endif
@@ -1004 +1008 @@
         list = RemoveFromList(tmp, list  ,";")
         
+        // anything that might be included in Irena
+        tmp = FunctionList("GEN_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IN2G_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR1A_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR1B_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR1U_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR1V_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR1_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR2D_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+
+        tmp = FunctionList("IR2D_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR2H_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")  
+        tmp = FunctionList("IR2L_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR2Pr_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR2R_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR2S_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("IR2_*",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        tmp = FunctionList("*LogLog",";","KIND:10")
+        list = RemoveFromList(tmp, list  ,";")
+        
 //      tmp = FunctionList("*X",";","KIND:4")           //XOPs, but these shouldn't show up if KIND:10 is used initially
 //      Print "X* = ",tmp