* Latest Change

Inputs/DetectorConfiguration/Riken_65mm.detector

@@ -8,26 +8,26 @@
 GeneralTarget
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 Target
-	THICKNESS= 18
-	RADIUS=	45
-	MATERIAL= CD2
-	ANGLE= 0
-	X= 0
-	Y= 0
-	Z= 0
+THICKNESS= 250000
+RADIUS=	45
+MATERIAL= D2
+ANGLE= 0
+X= 0
+Y= 0
+Z= 0
 	
-%%CryoTarget
-%	THICKNESS= 3
-%	RADIUS=	45
-%	TEMPERATURE= 26
-%	PRESSURE= 1
-%	MATERIAL= D2	
-%	WINDOWSTHICKNESS= 0
-%	WINDOWSMATERIAL= Mylar
-%	X= 0
-%	Y= 0
-%	Z= 0			
-%			
+%CryoTarget
+%THICKNESS= 250000
+%RADIUS=	45
+%TEMPERATURE= 300
+%PRESSURE= 1
+%MATERIAL= D2	
+%WINDOWSTHICKNESS= 0
+%WINDOWSMATERIAL= Mylar
+%X= 0
+%Y= 0
+%Z= 0			
+			
 %%%%%%%%%%%%%%%%%%%%%			
 MUST2Array			
 %%%%%%% Telescope 1 %%%%%%%			
@@ -128,7 +128,7 @@ VIS=    all
 
 
 %%%%%%%%%%%%%%%%%%%%%			
-SSSDArray
+%SSSDArray
 %%%%%%%%%% Det 1 %%%%%%%%			
 SSSD
 A=	17.61	9.85	104.11

NPLib/Tiara/TTiaraBarrelSpectra.cxx

@@ -104,12 +104,14 @@ void TTiaraBarrelSpectra::InitRawSpectra(){
   name = "OUTER_BARREL_STRIP_E_RAW";
   AddHisto2D(name, name, fNumberOfDetector*fOuterBarrelStrip, 1, fNumberOfDetector*fOuterBarrelStrip+1,512,0,16384, BaseFamily+"E");
 
-  //// SUM ////
+  //// VS ////
   // Inner Barrel
-  // Sum Up Stream
-  name = "INNER_BARREL_STRIP_SUM_RAW";
-  AddHisto2D(name, name, fNumberOfDetector*fInnerBarrelStrip, 1, fNumberOfDetector*fInnerBarrelStrip+1, 1024,0,32768,BaseFamily+"SUM");
-
+  for(unsigned int i  = 0 ; i < fNumberOfDetector ; i++){
+    for(unsigned int j = 0 ; j < fInnerBarrelStrip;j++){
+      name = Form("IB%d_VS%d_RAW",i+1,j+1);
+      AddHisto2D(name, name,1024,0,16384,1024,0,16384,BaseFamily+"VS");
+    }
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -186,20 +188,21 @@ void TTiaraBarrelSpectra::FillRawSpectra(TTiaraBarrelData* RawData){
       ->Fill((RawData->GetOuterEDetectorNbr(i)-1)*fInnerBarrelStrip
           +RawData->GetOuterEStripNbr(i),RawData->GetOuterEEnergy(i));
   }
-
-  // INNER_BARREL_US_HIT_RAW
+  
+  // INNER_BARREL_VS_RAW
+  family = BaseFamily+"VS";
   for (unsigned int i = 0; i < RawData->GetFrontUpstreamEMult(); i++) {
-    name = "INNER_BARREL_STRIP_SUM_RAW";
-    family = BaseFamily+"SUM";
+    int UpStreamDetNbr = RawData->GetFrontUpstreamEDetectorNbr(i);
+    int UpStreamStrNbr = RawData->GetFrontUpstreamEStripNbr(i);
+    
     for (unsigned int j = 0; j < RawData->GetFrontDownstreamEMult(); j++) {
-      int channelUP = (RawData->GetFrontDownstreamEDetectorNbr(i)-1)*fInnerBarrelStrip
-        +RawData->GetFrontDownstreamEStripNbr(i) ;
-      int channelDW = (RawData->GetFrontDownstreamEDetectorNbr(j)-1)*fInnerBarrelStrip
-        +RawData->GetFrontDownstreamEStripNbr(j) ;
-
-      if(channelUP==channelDW)
-        GetHisto(family,name)
-          ->Fill(channelUP,RawData->GetFrontDownstreamEEnergy(i)+RawData->GetFrontDownstreamEEnergy(i));
+      int DoStreamDetNbr = RawData->GetFrontDownstreamEDetectorNbr(j);
+      int DoStreamStrNbr = RawData->GetFrontDownstreamEStripNbr(j);
+     if(UpStreamDetNbr==DoStreamDetNbr && UpStreamStrNbr==DoStreamStrNbr){
+       name = Form("IB%d_VS%d_RAW",UpStreamDetNbr,UpStreamStrNbr); 
+       GetHisto(family,name)
+        ->Fill(RawData->GetFrontUpstreamEEnergy(i),RawData->GetFrontDownstreamEEnergy(j));
+      } 
     }
   }
 }

NPSimulation/src/Target.cc

@@ -77,8 +77,14 @@ G4Material* Target::GetMaterialFromLibrary(G4String MaterialName, G4double Tempe
   
   if (MaterialName == "D2") {
     G4double density = 0;
-    
-    if (Pressure == 1) {
+   
+    if(Pressure == 0 )
+     if (Temperature == 0) {
+        density = 0.000083771* g / cm3;
+        G4cout << "CryoTarget temp set to 300K with P = 1bar" << G4endl;
+      }
+ 
+    else if (Pressure == 1) {
       G4cout << "CryoTarget pressure set to 1 bar" << G4endl;
       
       if (Temperature == 24) {
@@ -101,6 +107,12 @@ G4Material* Target::GetMaterialFromLibrary(G4String MaterialName, G4double Tempe
         G4cout << "CryoTarget temp set to 30K" << G4endl;
       }
       
+      else if (Temperature == 300) {
+        density = 8.3771e-5* g / cm3;
+        G4cout << "CryoTarget temp set to 30K" << G4endl;
+      }
+      
+      
       else {
         G4cout << ">>>  !!!!WARNING INVALID TEMP FOR CRYOGENIC TARGET!!!!  <<<" << G4endl;
       }