Changeset 1010 for sans/Dev

Timestamp:

Sep 8, 2016 10:14:58 AM (7 years ago)

Author:

srkline

Message:

adding conditional compile checks to be sure that the XOPs are present for the version of Igor that is running. If XOPs are not present, user is notified.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (2 diffs)
• Reduction/SANS/EventModeProcessing.ipf (modified) (1 diff)
• Reduction/SANS/MultScatter_MonteCarlo_2D.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -45 +45 @@
                 Procedure_List()
 //              AutoPositionWindow/M=1/R=WrapperPanel Procedure_List            //keep it on-screen
+
         endif
 End
@@ -575 +576 @@
 Function FileList_InsertButtonProc(ctrlName) : ButtonControl
         String ctrlName
+
+// add a check here to warn users if the XOP functions are not present
+#if exists("SphereFormX")
+        // XOP present, all is OK
+#else
+        // XOP is not present, warn the user to re-run the installer
+        //check the 32-bit or 64-bit
+        String igorKindStr = StringByKey("IGORKIND", IgorInfo(0) )
+        String alertStr
+        if(strsearch(igorKindStr, "64", 0 ) != -1)
+                alertStr = "The SANSAnalysis XOP is not installed for the 64-bit version of Igor. "
+                alertStr += "It is recommended that you re-run the NCNR Installer. Click YES to stop and "
+                alertStr += "do the installation, or NO to continue with the analysis."
+        else
+                alertStr = "The SANSAnalysis XOP is not installed for the 32-bit version of Igor. "
+                alertStr += "It is recommended that you re-run the NCNR Installer. Click YES to stop and "
+                alertStr += "do the installation, or NO to continue with the analysis."
+        endif
+        DoAlert 1,alertStr      
+
+        if(V_flag == 1)
+                // get out gracefully
+                SetDataFolder root:
+                return(0)
+        endif
+
+#endif
         
         //loop through the selected files in the list...

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf

@@ -989 +989 @@
         LoadEvents_XOP()
 #else
+        // XOP is not present, warn the user to re-run the installer
+        //check the 32-bit or 64-bit
+        String igorKindStr = StringByKey("IGORKIND", IgorInfo(0) )
+        String alertStr
+        if(strsearch(igorKindStr, "64", 0 ) != -1)
+                alertStr = "The Event Loader XOP is not installed for the 64-bit version of Igor. Without it, event loading will "
+                alertStr += "be slow. It is recommended that you re-run the NCNR Installer. Click YES to stop and "
+                alertStr += "do the installation, or NO to continue with the file loading."
+        else
+                alertStr = "The Event Loader XOP is not installed for the 32-bit version of Igor. Without it, event loading will "
+                alertStr += "be slow. It is recommended that you re-run the NCNR Installer. Click YES to stop and "
+                alertStr += "do the installation, or NO to continue with the file loading."
+        endif
+        DoAlert 1,alertStr
+        
+        if(V_flag == 1)
+                // get out gracefully
+                SetDataFolder root:
+                return(0)
+        endif
+        
         LoadEvents()
 #endif  

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

@@ -144 +144 @@
 
 // make sure that the XOP exists if we are going to thread      
-#if exists("Monte_SANSX4")
+#if exists("Monte_SANSX4NNN")
         //OK
         if(nthreads>4)          //only support 4 processors until I can figure out how to properly thread the XOP and to loop it
@@ -151 +151 @@
         endif
 #else
+
         nthreads = 1
 #endif
@@ -1350 +1351 @@
                 case 2: // mouse up
                         // click code here
+#if (exists("Monte_SANSX"))     
+        // XOP exists, all is OK
+#else           
+        // XOP is not present, warn the user to re-run the installer
+        //check the 32-bit or 64-bit
+        String igorKindStr = StringByKey("IGORKIND", IgorInfo(0) )
+        String alertStr
+        if(strsearch(igorKindStr, "64", 0 ) != -1)
+                alertStr = "The MonteCarlo XOP is not installed for the 64-bit version of Igor. Without it, simulation will "
+                alertStr += "be slow. It is recommended that you re-run the NCNR Installer. Click YES to stop and "
+                alertStr += "do the installation, or NO to continue with the simulation."
+        else
+                alertStr = "The MonteCarlo XOP is not installed for the 32-bit version of Igor. Without it, simulation will "
+                alertStr += "be slow. It is recommended that you re-run the NCNR Installer. Click YES to stop and "
+                alertStr += "do the installation, or NO to continue with the simulation."
+        endif
+        DoAlert 1,alertStr      
+
+        if(V_flag == 1)
+                // get out gracefully
+                SetDataFolder root:
+                return(0)
+        endif
+#endif                  
+                        
                         NVAR doMC = root:Packages:NIST:SAS:gDoMonteCarlo
                         doMC = 1