Changeset 3248

Timestamp:

01/26/12 21:05:29 (4 months ago)

Author:

erkn

Message:

cogen: moved init after all positioning and assignment of setting parameters.

This caused some target_index used in init to use not yet assigned pos/rot.

Guide_anyshape: get rid of a compilation warning (access null pointer) for an

other one (format ‘%s’ expects type ‘char *’, but argument 4 has type ‘int’)

Location:

branches/mcxtrace-1.0

Files:

• nlib/optics/Guide_anyshape.comp (modified) (1 diff)
• src/cogen.c.in (modified) (3 diffs)

branches/mcxtrace-1.0/nlib/optics/Guide_anyshape.comp

@@ -103 +103 @@
   if (reflect && strlen(reflect)) {
     if (Table_Read(&pTable, reflect, 1) <= 0) /* read 1st block data from file into pTable */
-      exit(fprintf(stderr,"Guide_anyshape: %s: can not read file %s. Aborting coating used.\n", NAME_CURRENT_COMP, (char*)reflect));
+      exit(fprintf(stderr,"Guide_anyshape: %s: can not read file %s. Aborting.\n", NAME_CURRENT_COMP, reflect));
     else 
       Table_Rebin(&pTable);         /* rebin as evenly, increasing array */

branches/mcxtrace-1.0/src/cogen.c.in

@@ -944 +944 @@
     last = comp;
 
-    coutf("  /* Initializations for component %s. */", comp->name);
-    coutf("  SIG_MESSAGE(\"%s (Init)\");", comp->name); /* signal handler message */
-    /* Initialization of the component setting parameters. */
+    coutf("  /* Setting parameters for component %s. */", comp->name);
+    coutf("  SIG_MESSAGE(\"%s (Init:SetPar)\");", comp->name); /* signal handler message */
+    /* Setting parameters of the component setting parameters. */
     setpar = list_iterate(comp->def->set_par);
     while((par = list_next(setpar)) != NULL)
@@ -971 +971 @@
     cout("");
 
+  } /* end while instr->complist */
+  list_iterate_end(liter);
+  
+  /* Initialization of component and user initialization code. */
+  cout("  /* Component initializations. */");
+  liter = list_iterate(instr->complist);
+  while((comp = list_next(liter)) != NULL)
+  {
+    List_handle setpar;
+    struct comp_iformal *par;
+
+    coutf("  /* Initializations for component %s. */", comp->name);
+    coutf("  SIG_MESSAGE(\"%s (Init)\");", comp->name); /* signal handler message */
+
     /* Users initializations. */
     if(list_len(comp->def->init_code->lines) > 0)
@@ -976 +990 @@
                             comp->def->init_code);
     cout("");
-  } /* end while instr->complist */
+  }
   list_iterate_end(liter);