* e793s - solid angle sim update

* fixed solid angle issue, increase strip matching 0.06->0.20 for simulations
* overestimating Ex, so solid angles not perfectly correct yet

Projects/e793s/Analysis.cxx

@@ -281,12 +281,12 @@ void Analysis::TreatEvent(){
          << M2->GetTelescopeNormal(countMust2).Z() << endl;
     */
 
-    if(!isSim){
+//    if(!isSim){
       // Evaluate energy using the thickness
       elab_tmp = LightAl.EvaluateInitialEnergy(Energy, 0.4*micrometer, ThetaM2Surface);
       // Target Correction
       elab_tmp = LightTarget.EvaluateInitialEnergy(elab_tmp, 0.5*TargetThickness, ThetaNormalTarget);
-    } else {elab_tmp = Energy;}
+//    } else {elab_tmp = Energy;}
 
     ELab.push_back(elab_tmp);
 
@@ -364,7 +364,7 @@ void Analysis::TreatEvent(){
     Energy = MG->GetEnergyDeposit(countMugast);
     RawEnergy.push_back(Energy);
 
-    if(!isSim){
+    //if(!isSim){
       elab_tmp = LightAl.EvaluateInitialEnergy(
 		    Energy,              //particle energy after Al
 		    0.4*micrometer,      //thickness of Al
@@ -373,16 +373,16 @@ void Analysis::TreatEvent(){
 		    elab_tmp,            //particle energy after leaving target
 		    TargetThickness*0.5, //distance passed through target
 		    ThetaNormalTarget);  //angle of exit from target
-    } else {elab_tmp = Energy;}
+    //} else {elab_tmp = Energy;}
 
     ELab.push_back(elab_tmp);
 
     // Part 3 : Excitation Energy Calculation
-    if(!isSim){
+    //if(!isSim){ //TESTING!!!!
       Ex.push_back(reaction.ReconstructRelativistic(elab_tmp,thetalab_tmp));
       //Ex.push_back(reaction->ReconstructRelativistic(elab_tmp,thetalab_tmp));
       Ecm.push_back(elab_tmp*(AHeavy+ALight)/(4*AHeavy*cos(thetalab_tmp)*cos(thetalab_tmp)));
-    }
+    //}
 
     // Part 4 : Theta CM Calculation
     ThetaLab.push_back(thetalab_tmp/deg);

Projects/e793s/configs/ConfigMugast.dat

@@ -3,12 +3,9 @@ ConfigMugast
  TAKE_T_Y= 1 
 
  DISABLE_CHANNEL_X= 2 4
-
  DISABLE_CHANNEL_X= 3 7
  DISABLE_CHANNEL_X= 3 5
- 
  DISABLE_CHANNEL_X= 4 31
-
  DISABLE_CHANNEL_X= 5 61
  DISABLE_CHANNEL_X= 5 24
  DISABLE_CHANNEL_X= 5 32
@@ -22,7 +19,6 @@ ConfigMugast
  DISABLE_CHANNEL_X= 5 73
  DISABLE_CHANNEL_X= 5 71
  DISABLE_CHANNEL_X= 5 72
-
  DISABLE_CHANNEL_X= 7 9
  DISABLE_CHANNEL_X= 7 77
  DISABLE_CHANNEL_X= 7 75
@@ -50,13 +46,10 @@ ConfigMugast
  DISABLE_CHANNEL_Y= 1 26
  DISABLE_CHANNEL_Y= 1 13
  DISABLE_CHANNEL_Y= 1 15
-
  DISABLE_CHANNEL_Y= 2 39
  DISABLE_CHANNEL_Y= 2 16
  DISABLE_CHANNEL_Y= 2 62
- 
  DISABLE_CHANNEL_Y= 3 11
-
  DISABLE_CHANNEL_Y= 4 100
  DISABLE_CHANNEL_Y= 4 90
  DISABLE_CHANNEL_Y= 4 102
@@ -72,7 +65,6 @@ ConfigMugast
  DISABLE_CHANNEL_Y= 4 4
  DISABLE_CHANNEL_Y= 4 2
  DISABLE_CHANNEL_Y= 4 55
-
  DISABLE_CHANNEL_Y= 5 120
  DISABLE_CHANNEL_Y= 5 122
  DISABLE_CHANNEL_Y= 5 113
@@ -84,7 +76,6 @@ ConfigMugast
  DISABLE_CHANNEL_Y= 5 38
  DISABLE_CHANNEL_Y= 5 36
  DISABLE_CHANNEL_Y= 5 4
-
  DISABLE_CHANNEL_Y= 7 126
  DISABLE_CHANNEL_Y= 7 103
  DISABLE_CHANNEL_Y= 7 128
@@ -103,8 +94,10 @@ ConfigMugast
  DISABLE_CHANNEL_Y= 7 57
 
  MAX_STRIP_MULTIPLICITY= 10
- STRIP_ENERGY_MATCHING= 0.06 MeV
+ STRIP_ENERGY_MATCHING= 0.20 MeV
+ %STRIP_ENERGY_MATCHING= 0.06 MeV
  DSSD_X_E_RAW_THRESHOLD= 8250
  DSSD_Y_E_RAW_THRESHOLD= 8100
  DSSD_X_E_THRESHOLD= 1 
  DSSD_Y_E_THRESHOLD= 1
+