Changeset 402 for trunk/MagicSoft/Simulation/Detector

Timestamp:

06/13/00 14:25:24 (24 years ago)

Author:

blanch

Message:

The multiple arrays have been replaced, since they do not work
in alpha machines. Now we are using pointers and the command new
to allocate memory.

File:

• trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (modified) (5 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

@@ -21 +21 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.8 $
+// $Revision: 1.9 $
 // $Author: blanch $ 
-// $Date: 2000-05-11 13:57:27 $
+// $Date: 2000-06-13 13:25:24 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -601 +601 @@
   //  Definition and initialization of array to save trigger statistics
  
-  int ntriggerloop[(int) (Trigger_loop_uthres+1)][Trigger_loop_umult+1][Trigger_loop_utop+1];
-
-  for (ithrescount=Trigger_loop_lthres;ithrescount<=Trigger_loop_uthres;ithrescount++){
-    for (imulticount=Trigger_loop_lmult;imulticount<=Trigger_loop_umult;imulticount++){
-      for(itopocount=Trigger_loop_ltop;itopocount<=Trigger_loop_utop;itopocount++){
+  int ***ntriggerloop;
+
+  ntriggerloop= new int ** [(int) (Trigger_loop_uthres+1-Trigger_loop_lthres)]; 
+  for (ithrescount=0;ithrescount<=Trigger_loop_uthres-Trigger_loop_lthres;ithrescount++){
+    ntriggerloop[ithrescount]= new int * [Trigger_loop_umult-Trigger_loop_lmult+1];
+    for (imulticount=0;imulticount<=Trigger_loop_umult-Trigger_loop_lmult;imulticount++){
+      ntriggerloop[ithrescount][imulticount]= new int [Trigger_loop_utop-Trigger_loop_ltop+1];
+      for(itopocount=0;itopocount<=Trigger_loop_utop-Trigger_loop_ltop;itopocount++){
         ntriggerloop[ithrescount][imulticount][itopocount]=0;
       }
@@ -1102 +1105 @@
                   McTrig->SetFirstLevel (Lev1=Trigger.FirstLevel());
                   if(Lev1>0) {
-                    ntriggerloop[ithrescount][imulticount][itopocount]++;
+                    ntriggerloop[ithrescount-Trigger_loop_lthres][imulticount-Trigger_loop_lmult][itopocount-Trigger_loop_ltop]++;
                     McTrig->SetTopology(itopocount);
                     McTrig->SetMultiplicity(imulticount);
@@ -1366 +1369 @@
         for(itopocount=Trigger_loop_ltop;itopocount<=Trigger_loop_utop;itopocount++){
           log( SIGNATURE, "Thres %d, Multi %d, Topo %d: %5.1f%% (%d out of %d)\n", 
-               ithrescount,imulticount,itopocount,((float)ntriggerloop[ithrescount][imulticount][itopocount] / ((float)ntshow) * 100.0), ntriggerloop[ithrescount][imulticount][itopocount], ntshow);
+               ithrescount,imulticount,itopocount,((float)ntriggerloop[ithrescount-Trigger_loop_lthres][imulticount-Trigger_loop_lmult][itopocount-Trigger_loop_ltop] / ((float)ntshow) * 100.0), ntriggerloop[ithrescount-Trigger_loop_lthres][imulticount-Trigger_loop_lmult][itopocount-Trigger_loop_ltop], ntshow);
         }
       }   
@@ -2866 +2869 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.8  2000/05/11 13:57:27  blanch
+// The option to loop over several trigger configurations has been included.
+// Some non-sense with triggertime range has been solved.
+// Montecarlo information and ADC counts are saved in a root file.
+// There was a problem with the maximum number of phe that the program could analyse. Now there is not limit.
+//
 // Revision 1.7  2000/03/24 18:10:46  blanch
 // A first FADC simulation and a trigger simulation are already implemented.